ALSA: usb-audio: Use standard printk helpers

Convert with dev_err() and co from snd_printk(), etc.
As there are too deep indirections (e.g. ep->chip->dev->dev),
a few new local macros, usb_audio_err() & co, are introduced.

Also, the device numbers in some messages are dropped, as they are
shown in the prefix automatically.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 22 insertions, 19 deletions

diff --git a/sound/usb/card.c b/sound/usb/card.c
index 0cfdc2d3b631..893d5a1afc3c 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -139,8 +139,8 @@ static int snd_usb_create_stream(struct snd_usb_audio *chip, int ctrlif, int int
         struct usb_interface *iface = usb_ifnum_to_if(dev, interface);
 
         if (!iface) {
-                snd_printk(KERN_ERR "%d:%u:%d : does not exist\n",
-                           dev->devnum, ctrlif, interface);
+                dev_err(&dev->dev, "%u:%d : does not exist\n",
+                        ctrlif, interface);
                 return -EINVAL;
         }
 
@@ -165,8 +165,8 @@ static int snd_usb_create_stream(struct snd_usb_audio *chip, int ctrlif, int int
         }
 
         if (usb_interface_claimed(iface)) {
-                snd_printdd(KERN_INFO "%d:%d:%d: skipping, already claimed\n",
-                                                dev->devnum, ctrlif, interface);
+                dev_dbg(&dev->dev, "%d:%d: skipping, already claimed\n",
+                        ctrlif, interface);
                 return -EINVAL;
         }
 
@@ -176,8 +176,9 @@ static int snd_usb_create_stream(struct snd_usb_audio *chip, int ctrlif, int int
                 int err = snd_usbmidi_create(chip->card, iface,
                                              &chip->midi_list, NULL);
                 if (err < 0) {
-                        snd_printk(KERN_ERR "%d:%u:%d: cannot create sequencer device\n",
-                                                dev->devnum, ctrlif, interface);
+                        dev_err(&dev->dev,
+                                "%u:%d: cannot create sequencer device\n",
+                                ctrlif, interface);
                         return -EINVAL;
                 }
                 usb_driver_claim_interface(&usb_audio_driver, iface, (void *)-1L);
@@ -188,14 +189,15 @@ static int snd_usb_create_stream(struct snd_usb_audio *chip, int ctrlif, int int
         if ((altsd->bInterfaceClass != USB_CLASS_AUDIO &&
              altsd->bInterfaceClass != USB_CLASS_VENDOR_SPEC) ||
             altsd->bInterfaceSubClass != USB_SUBCLASS_AUDIOSTREAMING) {
-                snd_printdd(KERN_ERR "%d:%u:%d: skipping non-supported interface %d\n",
-                                        dev->devnum, ctrlif, interface, altsd->bInterfaceClass);
+                dev_dbg(&dev->dev,
+                        "%u:%d: skipping non-supported interface %d\n",
+                        ctrlif, interface, altsd->bInterfaceClass);
                 /* skip non-supported classes */
                 return -EINVAL;
         }
 
         if (snd_usb_get_speed(dev) == USB_SPEED_LOW) {
-                snd_printk(KERN_ERR "low speed audio streaming not supported\n");
+                dev_err(&dev->dev, "low speed audio streaming not supported\n");
                 return -EINVAL;
         }
 
@@ -228,26 +230,27 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)
         protocol = altsd->bInterfaceProtocol;
 
         if (!control_header) {
-                snd_printk(KERN_ERR "cannot find UAC_HEADER\n");
+                dev_err(&dev->dev, "cannot find UAC_HEADER\n");
                 return -EINVAL;
         }
 
         switch (protocol) {
         default:
-                snd_printdd(KERN_WARNING "unknown interface protocol %#02x, assuming v1\n",
-                            protocol);
+                dev_warn(&dev->dev,
+                         "unknown interface protocol %#02x, assuming v1\n",
+                         protocol);
                 /* fall through */
 
         case UAC_VERSION_1: {
                 struct uac1_ac_header_descriptor *h1 = control_header;
 
                 if (!h1->bInCollection) {
-                        snd_printk(KERN_INFO "skipping empty audio interface (v1)\n");
+                        dev_info(&dev->dev, "skipping empty audio interface (v1)\n");
                         return -EINVAL;
                 }
 
                 if (h1->bLength < sizeof(*h1) + h1->bInCollection) {
-                        snd_printk(KERN_ERR "invalid UAC_HEADER (v1)\n");
+                        dev_err(&dev->dev, "invalid UAC_HEADER (v1)\n");
                         return -EINVAL;
                 }
 
@@ -277,7 +280,7 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)
                 }
 
                 if (!assoc) {
-                        snd_printk(KERN_ERR "Audio class v2 interfaces need an interface association\n");
+                        dev_err(&dev->dev, "Audio class v2 interfaces need an interface association\n");
                         return -EINVAL;
                 }
 
@@ -351,14 +354,14 @@ static int snd_usb_audio_create(struct usb_interface *intf,
         case USB_SPEED_SUPER:
                 break;
         default:
-                snd_printk(KERN_ERR "unknown device speed %d\n", snd_usb_get_speed(dev));
+                dev_err(&dev->dev, "unknown device speed %d\n", snd_usb_get_speed(dev));
                 return -ENXIO;
         }
 
         err = snd_card_new(&intf->dev, index[idx], id[idx], THIS_MODULE,
                            0, &card);
         if (err < 0) {
-                snd_printk(KERN_ERR "cannot create card instance %d\n", idx);
+                dev_err(&dev->dev, "cannot create card instance %d\n", idx);
                 return err;
         }
 
@@ -499,7 +502,7 @@ snd_usb_audio_probe(struct usb_device *dev,
         for (i = 0; i < SNDRV_CARDS; i++) {
                 if (usb_chip[i] && usb_chip[i]->dev == dev) {
                         if (usb_chip[i]->shutdown) {
-                                snd_printk(KERN_ERR "USB device is in the shutdown state, cannot create a card instance\n");
+                                dev_err(&dev->dev, "USB device is in the shutdown state, cannot create a card instance\n");
                                 goto __error;
                         }
                         chip = usb_chip[i];
@@ -523,7 +526,7 @@ snd_usb_audio_probe(struct usb_device *dev,
                                 break;
                         }
                 if (!chip) {
-                        printk(KERN_ERR "no available usb audio device\n");
+                        dev_err(&dev->dev, "no available usb audio device\n");
                         goto __error;
                 }
         }