diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-02-25 11:02:09 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-26 10:45:27 -0500 |
commit | 6f002b02166cc037025c0d1600a0e638a82145ac (patch) | |
tree | edd3aacb99b3f744d67dc5703c63c8086ca2f2de /sound/pci/emu10k1/emumpu401.c | |
parent | 26bc6964f97b3a7d3c86fd4887cbfcb8e7c3d7ce (diff) |
ALSA: emu10k1: 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/pci/emu10k1/emumpu401.c')
-rw-r--r-- | sound/pci/emu10k1/emumpu401.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/pci/emu10k1/emumpu401.c b/sound/pci/emu10k1/emumpu401.c index 1ec91246dfee..fdf2b0ada489 100644 --- a/sound/pci/emu10k1/emumpu401.c +++ b/sound/pci/emu10k1/emumpu401.c | |||
@@ -64,7 +64,9 @@ static void mpu401_clear_rx(struct snd_emu10k1 *emu, struct snd_emu10k1_midi *mp | |||
64 | mpu401_read_data(emu, mpu); | 64 | mpu401_read_data(emu, mpu); |
65 | #ifdef CONFIG_SND_DEBUG | 65 | #ifdef CONFIG_SND_DEBUG |
66 | if (timeout <= 0) | 66 | if (timeout <= 0) |
67 | snd_printk(KERN_ERR "cmd: clear rx timeout (status = 0x%x)\n", mpu401_read_stat(emu, mpu)); | 67 | dev_err(emu->card->dev, |
68 | "cmd: clear rx timeout (status = 0x%x)\n", | ||
69 | mpu401_read_stat(emu, mpu)); | ||
68 | #endif | 70 | #endif |
69 | } | 71 | } |
70 | 72 | ||
@@ -141,7 +143,8 @@ static int snd_emu10k1_midi_cmd(struct snd_emu10k1 * emu, struct snd_emu10k1_mid | |||
141 | } | 143 | } |
142 | spin_unlock_irqrestore(&midi->input_lock, flags); | 144 | spin_unlock_irqrestore(&midi->input_lock, flags); |
143 | if (!ok) { | 145 | if (!ok) { |
144 | snd_printk(KERN_ERR "midi_cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)!!!\n", | 146 | dev_err(emu->card->dev, |
147 | "midi_cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)!!!\n", | ||
145 | cmd, emu->port, | 148 | cmd, emu->port, |
146 | mpu401_read_stat(emu, midi), | 149 | mpu401_read_stat(emu, midi), |
147 | mpu401_read_data(emu, midi)); | 150 | mpu401_read_data(emu, midi)); |