summaryrefslogtreecommitdiffstats
path: root/sound/usb/6fire/midi.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/midi.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/midi.c')
-rw-r--r--sound/usb/6fire/midi.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/usb/6fire/midi.c b/sound/usb/6fire/midi.c
index f3dd726..3d41096 100644
--- a/sound/usb/6fire/midi.c
+++ b/sound/usb/6fire/midi.c
@@ -41,8 +41,9 @@ static void usb6fire_midi_out_handler(struct urb *urb)
ret = usb_submit_urb(urb, GFP_ATOMIC);
if (ret < 0)
- snd_printk(KERN_ERR PREFIX "midi out urb "
- "submit failed: %d\n", ret);
+ dev_err(&urb->dev->dev,
+ "midi out urb submit failed: %d\n",
+ ret);
} else /* no more data to transmit */
rt->out = NULL;
}
@@ -94,8 +95,9 @@ static void usb6fire_midi_out_trigger(
ret = usb_submit_urb(urb, GFP_ATOMIC);
if (ret < 0)
- snd_printk(KERN_ERR PREFIX "midi out urb "
- "submit failed: %d\n", ret);
+ dev_err(&urb->dev->dev,
+ "midi out urb submit failed: %d\n",
+ ret);
else
rt->out = alsa_sub;
}
@@ -181,7 +183,7 @@ int usb6fire_midi_init(struct sfire_chip *chip)
if (ret < 0) {
kfree(rt->out_buffer);
kfree(rt);
- snd_printk(KERN_ERR PREFIX "unable to create midi.\n");
+ dev_err(&chip->dev->dev, "unable to create midi.\n");
return ret;
}
rt->instance->private_data = rt;
OpenPOWER on IntegriCloud