diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-02-25 12:48:27 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-26 16:45:11 +0100 |
| commit | c778f7ec74535196d225d1668cd3af57abcff89e (patch) | |
| tree | 3b6848b11f32ff06d556ac5240ff120b98e139db | |
| parent | bc340c3350fe411796df345815570322dc9969be (diff) | |
ALSA: als300: Use standard printk helpers
Convert with dev_err() and co from snd_printk(), etc.
Also, correct the printk level appropriately.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/als300.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sound/pci/als300.c b/sound/pci/als300.c index fc1043a79007..cc9a15a1304b 100644 --- a/sound/pci/als300.c +++ b/sound/pci/als300.c @@ -661,7 +661,7 @@ static int snd_als300_create(struct snd_card *card, if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 || pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) { - printk(KERN_ERR "error setting 28bit DMA mask\n"); + dev_err(card->dev, "error setting 28bit DMA mask\n"); pci_disable_device(pci); return -ENXIO; } @@ -693,7 +693,7 @@ static int snd_als300_create(struct snd_card *card, if (request_irq(pci->irq, irq_handler, IRQF_SHARED, KBUILD_MODNAME, chip)) { - snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); + dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq); snd_als300_free(chip); return -EBUSY; } @@ -704,13 +704,13 @@ static int snd_als300_create(struct snd_card *card, err = snd_als300_ac97(chip); if (err < 0) { - snd_printk(KERN_WARNING "Could not create ac97\n"); + dev_err(card->dev, "Could not create ac97\n"); snd_als300_free(chip); return err; } if ((err = snd_als300_new_pcm(chip)) < 0) { - snd_printk(KERN_WARNING "Could not create PCM\n"); + dev_err(card->dev, "Could not create PCM\n"); snd_als300_free(chip); return err; } @@ -751,8 +751,7 @@ static int snd_als300_resume(struct device *dev) pci_set_power_state(pci, PCI_D0); pci_restore_state(pci); if (pci_enable_device(pci) < 0) { - printk(KERN_ERR "als300: pci_enable_device failed, " - "disabling device\n"); + dev_err(dev, "pci_enable_device failed, disabling device\n"); snd_card_disconnect(card); return -EIO; } |