a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: als300: Use standard printk helpers

Browse Source 
Convert with dev_err() and co from snd_printk(), etc.
Also, correct the printk level appropriately.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2014-02-25 12:48:27 +01:00
parent bc340c3350
commit c778f7ec74
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/pci/als300.c
View File

@ -661,7 +661,7 @@ static int snd_als300_create(struct snd_card *card,
if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 || if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
pci_set_consistent_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); pci_disable_device(pci);
return -ENXIO; return -ENXIO;
} }
@ -693,7 +693,7 @@ static int snd_als300_create(struct snd_card *card,
if (request_irq(pci->irq, irq_handler, IRQF_SHARED, if (request_irq(pci->irq, irq_handler, IRQF_SHARED,
KBUILD_MODNAME, chip)) { 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); snd_als300_free(chip);
return -EBUSY; return -EBUSY;
} }
@ -704,13 +704,13 @@ static int snd_als300_create(struct snd_card *card,
err = snd_als300_ac97(chip); err = snd_als300_ac97(chip);
if (err < 0) { 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); snd_als300_free(chip);
return err; return err;
} }
if ((err = snd_als300_new_pcm(chip)) < 0) { 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); snd_als300_free(chip);
return err; return err;
} }
@ -751,8 +751,7 @@ static int snd_als300_resume(struct device *dev)
pci_set_power_state(pci, PCI_D0); pci_set_power_state(pci, PCI_D0);
pci_restore_state(pci); pci_restore_state(pci);
if (pci_enable_device(pci) < 0) { if (pci_enable_device(pci) < 0) {
printk(KERN_ERR "als300: pci_enable_device failed, " dev_err(dev, "pci_enable_device failed, disabling device\n");
"disabling device\n");
snd_card_disconnect(card); snd_card_disconnect(card);
return -EIO; return -EIO;
} }