ALSA: rme96: Use standard printk helpers
authorTakashi Iwai <tiwai@suse.de>
Tue, 25 Feb 2014 14:03:18 +0000 (15:03 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 26 Feb 2014 15:45:20 +0000 (16:45 +0100)
Convert with dev_err() and co from snd_printk(), etc.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/rme96.c

index f5014a8e69adbeede2f109440f3df3689db2ae52..76169929770dd10b25cc9ef91ecd6f85d2e90d9e 100644 (file)
@@ -1609,13 +1609,15 @@ snd_rme96_create(struct rme96 *rme96)
 
        rme96->iobase = ioremap_nocache(rme96->port, RME96_IO_SIZE);
        if (!rme96->iobase) {
-               snd_printk(KERN_ERR "unable to remap memory region 0x%lx-0x%lx\n", rme96->port, rme96->port + RME96_IO_SIZE - 1);
+               dev_err(rme96->card->dev,
+                       "unable to remap memory region 0x%lx-0x%lx\n",
+                       rme96->port, rme96->port + RME96_IO_SIZE - 1);
                return -ENOMEM;
        }
 
        if (request_irq(pci->irq, snd_rme96_interrupt, IRQF_SHARED,
                        KBUILD_MODNAME, rme96)) {
-               snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
+               dev_err(rme96->card->dev, "unable to grab IRQ %d\n", pci->irq);
                return -EBUSY;
        }
        rme96->irq = pci->irq;
@@ -2414,7 +2416,7 @@ static int rme96_resume(struct device *dev)
 
        pci_restore_state(pci);
        if (pci_enable_device(pci) < 0) {
-               printk(KERN_ERR "rme96: pci_enable_device failed, disabling device\n");
+               dev_err(dev, "pci_enable_device failed, disabling device\n");
                snd_card_disconnect(card);
                return -EIO;
        }
@@ -2494,14 +2496,14 @@ snd_rme96_probe(struct pci_dev *pci,
 #ifdef CONFIG_PM_SLEEP
        rme96->playback_suspend_buffer = vmalloc(RME96_BUFFER_SIZE);
        if (!rme96->playback_suspend_buffer) {
-               snd_printk(KERN_ERR
+               dev_err(card->dev,
                           "Failed to allocate playback suspend buffer!\n");
                snd_card_free(card);
                return -ENOMEM;
        }
        rme96->capture_suspend_buffer = vmalloc(RME96_BUFFER_SIZE);
        if (!rme96->capture_suspend_buffer) {
-               snd_printk(KERN_ERR
+               dev_err(card->dev,
                           "Failed to allocate capture suspend buffer!\n");
                snd_card_free(card);
                return -ENOMEM;