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/emu10k1.c | |
| parent | 26bc6964f97b3a7d3c86fd4887cbfcb8e7c3d7ce (diff) | |
| download | linux-stable-6f002b02166cc037025c0d1600a0e638a82145ac.tar.gz linux-stable-6f002b02166cc037025c0d1600a0e638a82145ac.tar.bz2 linux-stable-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/emu10k1.c')
| -rw-r--r-- | sound/pci/emu10k1/emu10k1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c index 5c0413b40dc3..ad9d9f8b48ed 100644 --- a/sound/pci/emu10k1/emu10k1.c +++ b/sound/pci/emu10k1/emu10k1.c @@ -170,7 +170,8 @@ static int snd_card_emu10k1_probe(struct pci_dev *pci, if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, sizeof(struct snd_emu10k1_synth_arg), &wave) < 0 || wave == NULL) { - snd_printk(KERN_WARNING "can't initialize Emu10k1 wavetable synth\n"); + dev_warn(emu->card->dev, + "can't initialize Emu10k1 wavetable synth\n"); } else { struct snd_emu10k1_synth_arg *arg; arg = SNDRV_SEQ_DEVICE_ARGPTR(wave); @@ -247,8 +248,7 @@ static int snd_emu10k1_resume(struct device *dev) pci_set_power_state(pci, PCI_D0); pci_restore_state(pci); if (pci_enable_device(pci) < 0) { - printk(KERN_ERR "emu10k1: pci_enable_device failed, " - "disabling device\n"); + dev_err(dev, "pci_enable_device failed, disabling device\n"); snd_card_disconnect(card); return -EIO; } |