diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2014-02-25 17:02:09 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-26 16:45:27 +0100 |
| commit | 6f002b02166cc037025c0d1600a0e638a82145ac (patch) | |
| tree | edd3aacb99b3f744d67dc5703c63c8086ca2f2de /sound/pci/emu10k1/io.c | |
| parent | ALSA: emu10k1x: Use standard printk helpers (diff) | |
| download | linux-dev-6f002b02166cc037025c0d1600a0e638a82145ac.tar.xz linux-dev-6f002b02166cc037025c0d1600a0e638a82145ac.zip | |
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/io.c')
| -rw-r--r-- | sound/pci/emu10k1/io.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c index e4fba49fee4a..81c75b4528d9 100644 --- a/sound/pci/emu10k1/io.c +++ b/sound/pci/emu10k1/io.c @@ -72,7 +72,7 @@ void snd_emu10k1_ptr_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned i unsigned int mask; if (!emu) { - snd_printk(KERN_ERR "ptr_write: emu is null!\n"); + dev_err(emu->card->dev, "ptr_write: emu is null!\n"); dump_stack(); return; } @@ -199,7 +199,7 @@ int snd_emu10k1_i2c_write(struct snd_emu10k1 *emu, int err = 0; if ((reg > 0x7f) || (value > 0x1ff)) { - snd_printk(KERN_ERR "i2c_write: invalid values.\n"); + dev_err(emu->card->dev, "i2c_write: invalid values.\n"); return -EINVAL; } @@ -227,7 +227,7 @@ int snd_emu10k1_i2c_write(struct snd_emu10k1 *emu, break; if (timeout > 1000) { - snd_printk(KERN_WARNING + dev_warn(emu->card->dev, "emu10k1:I2C:timeout status=0x%x\n", status); break; @@ -239,8 +239,8 @@ int snd_emu10k1_i2c_write(struct snd_emu10k1 *emu, } if (retry == 10) { - snd_printk(KERN_ERR "Writing to ADC failed!\n"); - snd_printk(KERN_ERR "status=0x%x, reg=%d, value=%d\n", + dev_err(emu->card->dev, "Writing to ADC failed!\n"); + dev_err(emu->card->dev, "status=0x%x, reg=%d, value=%d\n", status, reg, value); /* dump_stack(); */ err = -EINVAL; |