tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ALSA: rme9652: Use standard printk helpers

Convert with dev_err() and co from snd_printk(), etc.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

Takashi Iwai 09ae539e e3a471d6

+13 -6
+13 -6
sound/pci/rme9652/rme9652.c
··· 394 394 if (offset < period_size) { 395 395 if (offset > rme9652->max_jitter) { 396 396 if (frag) 397 - printk(KERN_ERR "Unexpected hw_pointer position (bufid == 0): status: %x offset: %d\n", status, offset); 397 + dev_err(rme9652->card->dev, 398 + "Unexpected hw_pointer position (bufid == 0): status: %x offset: %d\n", 399 + status, offset); 398 400 } else if (!frag) 399 401 return 0; 400 402 offset -= rme9652->max_jitter; ··· 405 403 } else { 406 404 if (offset > period_size + rme9652->max_jitter) { 407 405 if (!frag) 408 - printk(KERN_ERR "Unexpected hw_pointer position (bufid == 1): status: %x offset: %d\n", status, offset); 406 + dev_err(rme9652->card->dev, 407 + "Unexpected hw_pointer position (bufid == 1): status: %x offset: %d\n", 408 + status, offset); 409 409 } else if (frag) 410 410 return period_size; 411 411 offset -= rme9652->max_jitter; ··· 773 769 break; 774 770 775 771 default: 776 - snd_printk(KERN_ERR "%s: unknown S/PDIF input rate (bits = 0x%x)\n", 772 + dev_err(s->card->dev, 773 + "%s: unknown S/PDIF input rate (bits = 0x%x)\n", 777 774 s->card_name, rate_bits); 778 775 return 0; 779 776 break; ··· 1795 1790 snd_hammerfall_get_buffer(rme9652->pci, &rme9652->playback_dma_buf, RME9652_DMA_AREA_BYTES) < 0) { 1796 1791 if (rme9652->capture_dma_buf.area) 1797 1792 snd_dma_free_pages(&rme9652->capture_dma_buf); 1798 - printk(KERN_ERR "%s: no buffers available\n", rme9652->card_name); 1793 + dev_err(rme9652->card->dev, 1794 + "%s: no buffers available\n", rme9652->card_name); 1799 1795 return -ENOMEM; 1800 1796 } 1801 1797 ··· 2474 2468 rme9652->port = pci_resource_start(pci, 0); 2475 2469 rme9652->iobase = ioremap_nocache(rme9652->port, RME9652_IO_EXTENT); 2476 2470 if (rme9652->iobase == NULL) { 2477 - snd_printk(KERN_ERR "unable to remap region 0x%lx-0x%lx\n", rme9652->port, rme9652->port + RME9652_IO_EXTENT - 1); 2471 + dev_err(card->dev, "unable to remap region 0x%lx-0x%lx\n", 2472 + rme9652->port, rme9652->port + RME9652_IO_EXTENT - 1); 2478 2473 return -EBUSY; 2479 2474 } 2480 2475 2481 2476 if (request_irq(pci->irq, snd_rme9652_interrupt, IRQF_SHARED, 2482 2477 KBUILD_MODNAME, rme9652)) { 2483 - snd_printk(KERN_ERR "unable to request IRQ %d\n", pci->irq); 2478 + dev_err(card->dev, "unable to request IRQ %d\n", pci->irq); 2484 2479 return -EBUSY; 2485 2480 } 2486 2481 rme9652->irq = pci->irq;