ALSA: usb-audio: Use standard printk helpers

[deliverable/linux.git] / sound / usb / stream.c

diff --git a/sound/usb/stream.c b/sound/usb/stream.c
index 2fb71be5e100b0973c0993dbb8ed4da3f35c5cf2..310a3822d2b72b51586a9ee06954ef08667bbeb8 100644 (file)
--- a/sound/usb/stream.c
+++ b/sound/usb/stream.c
@@ -411,10 +411,9 @@ static int parse_uac_endpoint_attributes(struct snd_usb_audio *chip,
 
        if (!csep || csep->bLength < 7 ||
            csep->bDescriptorSubtype != UAC_EP_GENERAL) {
-               snd_printk(KERN_WARNING "%d:%u:%d : no or invalid"
-                          " class specific endpoint descriptor\n",
-                          chip->dev->devnum, iface_no,
-                          altsd->bAlternateSetting);
+               usb_audio_warn(chip,
+                              "%u:%d : no or invalid class specific endpoint descriptor\n",
+                              iface_no, altsd->bAlternateSetting);
                return 0;
        }
 
@@ -533,8 +532,8 @@ int snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no)
                /* get audio formats */
                switch (protocol) {
                default:
-                       snd_printdd(KERN_WARNING "%d:%u:%d: unknown interface protocol %#02x, assuming v1\n",
-                                   dev->devnum, iface_no, altno, protocol);
+                       dev_dbg(&dev->dev, "%u:%d: unknown interface protocol %#02x, assuming v1\n",
+                               iface_no, altno, protocol);
                        protocol = UAC_VERSION_1;
                        /* fall through */
 
@@ -544,14 +543,16 @@ int snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no)
                        struct uac_input_terminal_descriptor *iterm;
 
                        if (!as) {
-                               snd_printk(KERN_ERR "%d:%u:%d : UAC_AS_GENERAL descriptor not found\n",
-                                          dev->devnum, iface_no, altno);
+                               dev_err(&dev->dev,
+                                       "%u:%d : UAC_AS_GENERAL descriptor not found\n",
+                                       iface_no, altno);
                                continue;
                        }
 
                        if (as->bLength < sizeof(*as)) {
-                               snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_AS_GENERAL desc\n",
-                                          dev->devnum, iface_no, altno);
+                               dev_err(&dev->dev,
+                                       "%u:%d : invalid UAC_AS_GENERAL desc\n",
+                                       iface_no, altno);
                                continue;
                        }
 
@@ -574,14 +575,16 @@ int snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no)
                                snd_usb_find_csint_desc(alts->extra, alts->extralen, NULL, UAC_AS_GENERAL);
 
                        if (!as) {
-                               snd_printk(KERN_ERR "%d:%u:%d : UAC_AS_GENERAL descriptor not found\n",
-                                          dev->devnum, iface_no, altno);
+                               dev_err(&dev->dev,
+                                       "%u:%d : UAC_AS_GENERAL descriptor not found\n",
+                                       iface_no, altno);
                                continue;
                        }
 
                        if (as->bLength < sizeof(*as)) {
-                               snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_AS_GENERAL desc\n",
-                                          dev->devnum, iface_no, altno);
+                               dev_err(&dev->dev,
+                                       "%u:%d : invalid UAC_AS_GENERAL desc\n",
+                                       iface_no, altno);
                                continue;
                        }
 
@@ -607,8 +610,9 @@ int snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no)
                                break;
                        }
 
-                       snd_printk(KERN_ERR "%d:%u:%d : bogus bTerminalLink %d\n",
-                                  dev->devnum, iface_no, altno, as->bTerminalLink);
+                       dev_err(&dev->dev,
+                               "%u:%d : bogus bTerminalLink %d\n",
+                               iface_no, altno, as->bTerminalLink);
                        continue;
                }
                }
@@ -616,14 +620,16 @@ int snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no)
                /* get format type */
                fmt = snd_usb_find_csint_desc(alts->extra, alts->extralen, NULL, UAC_FORMAT_TYPE);
                if (!fmt) {
-                       snd_printk(KERN_ERR "%d:%u:%d : no UAC_FORMAT_TYPE desc\n",
-                                  dev->devnum, iface_no, altno);
+                       dev_err(&dev->dev,
+                               "%u:%d : no UAC_FORMAT_TYPE desc\n",
+                               iface_no, altno);
                        continue;
                }
                if (((protocol == UAC_VERSION_1) && (fmt->bLength < 8)) ||
                    ((protocol == UAC_VERSION_2) && (fmt->bLength < 6))) {
-                       snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_FORMAT_TYPE desc\n",
-                                  dev->devnum, iface_no, altno);
+                       dev_err(&dev->dev,
+                               "%u:%d : invalid UAC_FORMAT_TYPE desc\n",
+                               iface_no, altno);
                        continue;
                }
 
@@ -644,7 +650,7 @@ int snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no)
 
                fp = kzalloc(sizeof(*fp), GFP_KERNEL);
                if (! fp) {
-                       snd_printk(KERN_ERR "cannot malloc\n");
+                       dev_err(&dev->dev, "cannot malloc\n");
                        return -ENOMEM;
                }
 
@@ -707,7 +713,7 @@ int snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no)
                        chconfig = 0;
                fp->chmap = convert_chmap(fp->channels, chconfig, protocol);
 
-               snd_printdd(KERN_INFO "%d:%u:%d: add audio endpoint %#x\n", dev->devnum, iface_no, altno, fp->endpoint);
+               dev_dbg(&dev->dev, "%u:%d: add audio endpoint %#x\n", iface_no, altno, fp->endpoint);
                err = snd_usb_add_audio_stream(chip, stream, fp);
                if (err < 0) {
                        kfree(fp->rate_table);