diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-02-25 09:03:18 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-26 10:45:20 -0500 |
commit | 342cd93439501f8b8f7e150ad23fb9f24d6b8920 (patch) | |
tree | f30cbb2751268a0de78a2167b6902c991aeab7c3 /sound/pci | |
parent | 03952a3e2d98757a848a0d299d3e7c8ad0f08ffc (diff) |
ALSA: rme96: 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')
-rw-r--r-- | sound/pci/rme96.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c index f5014a8e69ad..76169929770d 100644 --- a/sound/pci/rme96.c +++ b/sound/pci/rme96.c | |||
@@ -1609,13 +1609,15 @@ snd_rme96_create(struct rme96 *rme96) | |||
1609 | 1609 | ||
1610 | rme96->iobase = ioremap_nocache(rme96->port, RME96_IO_SIZE); | 1610 | rme96->iobase = ioremap_nocache(rme96->port, RME96_IO_SIZE); |
1611 | if (!rme96->iobase) { | 1611 | if (!rme96->iobase) { |
1612 | snd_printk(KERN_ERR "unable to remap memory region 0x%lx-0x%lx\n", rme96->port, rme96->port + RME96_IO_SIZE - 1); | 1612 | dev_err(rme96->card->dev, |
1613 | "unable to remap memory region 0x%lx-0x%lx\n", | ||
1614 | rme96->port, rme96->port + RME96_IO_SIZE - 1); | ||
1613 | return -ENOMEM; | 1615 | return -ENOMEM; |
1614 | } | 1616 | } |
1615 | 1617 | ||
1616 | if (request_irq(pci->irq, snd_rme96_interrupt, IRQF_SHARED, | 1618 | if (request_irq(pci->irq, snd_rme96_interrupt, IRQF_SHARED, |
1617 | KBUILD_MODNAME, rme96)) { | 1619 | KBUILD_MODNAME, rme96)) { |
1618 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1620 | dev_err(rme96->card->dev, "unable to grab IRQ %d\n", pci->irq); |
1619 | return -EBUSY; | 1621 | return -EBUSY; |
1620 | } | 1622 | } |
1621 | rme96->irq = pci->irq; | 1623 | rme96->irq = pci->irq; |
@@ -2414,7 +2416,7 @@ static int rme96_resume(struct device *dev) | |||
2414 | 2416 | ||
2415 | pci_restore_state(pci); | 2417 | pci_restore_state(pci); |
2416 | if (pci_enable_device(pci) < 0) { | 2418 | if (pci_enable_device(pci) < 0) { |
2417 | printk(KERN_ERR "rme96: pci_enable_device failed, disabling device\n"); | 2419 | dev_err(dev, "pci_enable_device failed, disabling device\n"); |
2418 | snd_card_disconnect(card); | 2420 | snd_card_disconnect(card); |
2419 | return -EIO; | 2421 | return -EIO; |
2420 | } | 2422 | } |
@@ -2494,14 +2496,14 @@ snd_rme96_probe(struct pci_dev *pci, | |||
2494 | #ifdef CONFIG_PM_SLEEP | 2496 | #ifdef CONFIG_PM_SLEEP |
2495 | rme96->playback_suspend_buffer = vmalloc(RME96_BUFFER_SIZE); | 2497 | rme96->playback_suspend_buffer = vmalloc(RME96_BUFFER_SIZE); |
2496 | if (!rme96->playback_suspend_buffer) { | 2498 | if (!rme96->playback_suspend_buffer) { |
2497 | snd_printk(KERN_ERR | 2499 | dev_err(card->dev, |
2498 | "Failed to allocate playback suspend buffer!\n"); | 2500 | "Failed to allocate playback suspend buffer!\n"); |
2499 | snd_card_free(card); | 2501 | snd_card_free(card); |
2500 | return -ENOMEM; | 2502 | return -ENOMEM; |
2501 | } | 2503 | } |
2502 | rme96->capture_suspend_buffer = vmalloc(RME96_BUFFER_SIZE); | 2504 | rme96->capture_suspend_buffer = vmalloc(RME96_BUFFER_SIZE); |
2503 | if (!rme96->capture_suspend_buffer) { | 2505 | if (!rme96->capture_suspend_buffer) { |
2504 | snd_printk(KERN_ERR | 2506 | dev_err(card->dev, |
2505 | "Failed to allocate capture suspend buffer!\n"); | 2507 | "Failed to allocate capture suspend buffer!\n"); |
2506 | snd_card_free(card); | 2508 | snd_card_free(card); |
2507 | return -ENOMEM; | 2509 | return -ENOMEM; |