summaryrefslogtreecommitdiffstats
path: root/sound/usb/6fire/chip.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-02-26 15:51:04 +0100
committerTakashi Iwai <tiwai@suse.de>2014-02-26 17:22:09 +0100
commite3b3757b92a4df4addff74e179438afbfd8bb643 (patch)
tree38497244675921f9a90b08d40839f35d8c02921f /sound/usb/6fire/chip.c
parent0ba41d917eeb87f608cf147f870ff2f4c1056bab (diff)
downloadop-kernel-dev-e3b3757b92a4df4addff74e179438afbfd8bb643.zip
op-kernel-dev-e3b3757b92a4df4addff74e179438afbfd8bb643.tar.gz
ALSA: 6fire: Use standard printk helpers
Convert with dev_err() and co from snd_printk(), etc. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/6fire/chip.c')
-rw-r--r--sound/usb/6fire/chip.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/usb/6fire/chip.c b/sound/usb/6fire/chip.c
index e0fe0d9..dcddfc3 100644
--- a/sound/usb/6fire/chip.c
+++ b/sound/usb/6fire/chip.c
@@ -106,7 +106,7 @@ static int usb6fire_chip_probe(struct usb_interface *intf,
}
if (regidx < 0) {
mutex_unlock(&register_mutex);
- snd_printk(KERN_ERR PREFIX "too many cards registered.\n");
+ dev_err(&intf->dev, "too many cards registered.\n");
return -ENODEV;
}
devices[regidx] = device;
@@ -121,13 +121,13 @@ static int usb6fire_chip_probe(struct usb_interface *intf,
/* if we are here, card can be registered in alsa. */
if (usb_set_interface(device, 0, 0) != 0) {
- snd_printk(KERN_ERR PREFIX "can't set first interface.\n");
+ dev_err(&intf->dev, "can't set first interface.\n");
return -EIO;
}
ret = snd_card_new(&intf->dev, index[regidx], id[regidx],
THIS_MODULE, sizeof(struct sfire_chip), &card);
if (ret < 0) {
- snd_printk(KERN_ERR PREFIX "cannot create alsa card.\n");
+ dev_err(&intf->dev, "cannot create alsa card.\n");
return ret;
}
strcpy(card->driver, "6FireUSB");
@@ -168,7 +168,7 @@ static int usb6fire_chip_probe(struct usb_interface *intf,
ret = snd_card_register(card);
if (ret < 0) {
- snd_printk(KERN_ERR PREFIX "cannot register card.");
+ dev_err(&intf->dev, "cannot register card.");
usb6fire_chip_destroy(chip);
return ret;
}
OpenPOWER on IntegriCloud