aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-02-25 06:48:27 -0500
committerTakashi Iwai <tiwai@suse.de>2014-02-26 10:45:11 -0500
commitc778f7ec74535196d225d1668cd3af57abcff89e (patch)
tree3b6848b11f32ff06d556ac5240ff120b98e139db
parentbc340c3350fe411796df345815570322dc9969be (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.c11
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,
661 661
662 if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 || 662 if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
663 pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) { 663 pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
664 printk(KERN_ERR "error setting 28bit DMA mask\n"); 664 dev_err(card->dev, "error setting 28bit DMA mask\n");
665 pci_disable_device(pci); 665 pci_disable_device(pci);
666 return -ENXIO; 666 return -ENXIO;
667 } 667 }
@@ -693,7 +693,7 @@ static int snd_als300_create(struct snd_card *card,
693 693
694 if (request_irq(pci->irq, irq_handler, IRQF_SHARED, 694 if (request_irq(pci->irq, irq_handler, IRQF_SHARED,
695 KBUILD_MODNAME, chip)) { 695 KBUILD_MODNAME, chip)) {
696 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 696 dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
697 snd_als300_free(chip); 697 snd_als300_free(chip);
698 return -EBUSY; 698 return -EBUSY;
699 } 699 }
@@ -704,13 +704,13 @@ static int snd_als300_create(struct snd_card *card,
704 704
705 err = snd_als300_ac97(chip); 705 err = snd_als300_ac97(chip);
706 if (err < 0) { 706 if (err < 0) {
707 snd_printk(KERN_WARNING "Could not create ac97\n"); 707 dev_err(card->dev, "Could not create ac97\n");
708 snd_als300_free(chip); 708 snd_als300_free(chip);
709 return err; 709 return err;
710 } 710 }
711 711
712 if ((err = snd_als300_new_pcm(chip)) < 0) { 712 if ((err = snd_als300_new_pcm(chip)) < 0) {
713 snd_printk(KERN_WARNING "Could not create PCM\n"); 713 dev_err(card->dev, "Could not create PCM\n");
714 snd_als300_free(chip); 714 snd_als300_free(chip);
715 return err; 715 return err;
716 } 716 }
@@ -751,8 +751,7 @@ static int snd_als300_resume(struct device *dev)
751 pci_set_power_state(pci, PCI_D0); 751 pci_set_power_state(pci, PCI_D0);
752 pci_restore_state(pci); 752 pci_restore_state(pci);
753 if (pci_enable_device(pci) < 0) { 753 if (pci_enable_device(pci) < 0) {
754 printk(KERN_ERR "als300: pci_enable_device failed, " 754 dev_err(dev, "pci_enable_device failed, disabling device\n");
755 "disabling device\n");
756 snd_card_disconnect(card); 755 snd_card_disconnect(card);
757 return -EIO; 756 return -EIO;
758 } 757 }