kevin/linux
1
Fork 0
Code

ALSA: ad1816a: Use standard print API

Browse Source 
Use the standard print API with dev_*() instead of the old house-baked
one.  It gives better information and allows dynamically control of
debug prints.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20240807133452.9424-19-tiwai@suse.de
This commit is contained in:
Takashi Iwai 2024-08-07 15:34:08 +02:00
parent ae1873eeb8
commit 20869176d7
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/isa/ad1816a/ad1816a.c
View File

@ -17,8 +17,6 @@
#include <sound/mpu401.h> #include <sound/mpu401.h>
#include <sound/opl3.h> #include <sound/opl3.h>
#define PFX "ad1816a: "
MODULE_AUTHOR("Massimo Piccioni <dafastidio@libero.it>"); MODULE_AUTHOR("Massimo Piccioni <dafastidio@libero.it>");
MODULE_DESCRIPTION("AD1816A, AD1815"); MODULE_DESCRIPTION("AD1816A, AD1815");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
@ -87,7 +85,7 @@ static int snd_card_ad1816a_pnp(int dev, struct pnp_card_link *card,
err = pnp_activate_dev(pdev); err = pnp_activate_dev(pdev);
if (err < 0) { if (err < 0) {
printk(KERN_ERR PFX "AUDIO PnP configure failure\n"); dev_err(&pdev->dev, "AUDIO PnP configure failure\n");
return -EBUSY; return -EBUSY;
} }
@ -100,13 +98,13 @@ static int snd_card_ad1816a_pnp(int dev, struct pnp_card_link *card,
pdev = pnp_request_card_device(card, id->devs[1].id, NULL); pdev = pnp_request_card_device(card, id->devs[1].id, NULL);
if (pdev == NULL) { if (pdev == NULL) {
mpu_port[dev] = -1; mpu_port[dev] = -1;
snd_printk(KERN_WARNING PFX "MPU401 device busy, skipping.\n"); dev_warn(&pdev->dev, "MPU401 device busy, skipping.\n");
return 0; return 0;
} }
err = pnp_activate_dev(pdev); err = pnp_activate_dev(pdev);
if (err < 0) { if (err < 0) {
printk(KERN_ERR PFX "MPU401 PnP configure failure\n"); dev_err(&pdev->dev, "MPU401 PnP configure failure\n");
mpu_port[dev] = -1; mpu_port[dev] = -1;
} else { } else {
mpu_port[dev] = pnp_port_start(pdev, 0); mpu_port[dev] = pnp_port_start(pdev, 0);
@ -166,14 +164,16 @@ static int snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard,
if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
mpu_port[dev], 0, mpu_irq[dev], mpu_port[dev], 0, mpu_irq[dev],
NULL) < 0) NULL) < 0)
printk(KERN_ERR PFX "no MPU-401 device at 0x%lx.\n", mpu_port[dev]); dev_err(card->dev, "no MPU-401 device at 0x%lx.\n",
mpu_port[dev]);
} }
if (fm_port[dev] > 0) { if (fm_port[dev] > 0) {
if (snd_opl3_create(card, if (snd_opl3_create(card,
fm_port[dev], fm_port[dev] + 2, fm_port[dev], fm_port[dev] + 2,
OPL3_HW_AUTO, 0, &opl3) < 0) { OPL3_HW_AUTO, 0, &opl3) < 0) {
printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx.\n", fm_port[dev], fm_port[dev] + 2); dev_err(card->dev, "no OPL device at 0x%lx-0x%lx.\n",
fm_port[dev], fm_port[dev] + 2);
} else { } else {
error = snd_opl3_hwdep_new(opl3, 0, 1, NULL); error = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
if (error < 0) if (error < 0)
@ -252,7 +252,7 @@ static int __init alsa_card_ad1816a_init(void)
if (!ad1816a_devices) { if (!ad1816a_devices) {
pnp_unregister_card_driver(&ad1816a_pnpc_driver); pnp_unregister_card_driver(&ad1816a_pnpc_driver);
#ifdef MODULE #ifdef MODULE
printk(KERN_ERR "no AD1816A based soundcards found.\n"); pr_err("no AD1816A based soundcards found.\n");
#endif /* MODULE */ #endif /* MODULE */
return -ENODEV; return -ENODEV;
} }

16
sound/isa/ad1816a/ad1816a_lib.c
View File

@ -25,7 +25,7 @@ static inline int snd_ad1816a_busy_wait(struct snd_ad1816a *chip)
if (inb(AD1816A_REG(AD1816A_CHIP_STATUS)) & AD1816A_READY) if (inb(AD1816A_REG(AD1816A_CHIP_STATUS)) & AD1816A_READY)
return 0; return 0;
snd_printk(KERN_WARNING "chip busy.\n"); dev_warn(chip->card->dev, "chip busy.\n");
return -EBUSY; return -EBUSY;
} }
@ -186,7 +186,7 @@ static int snd_ad1816a_trigger(struct snd_ad1816a *chip, unsigned char what,
spin_unlock(&chip->lock); spin_unlock(&chip->lock);
break; break;
default: default:
snd_printk(KERN_WARNING "invalid trigger mode 0x%x.\n", what); dev_warn(chip->card->dev, "invalid trigger mode 0x%x.\n", what);
error = -EINVAL; error = -EINVAL;
} }
@ -548,8 +548,8 @@ static const char *snd_ad1816a_chip_id(struct snd_ad1816a *chip)
case AD1816A_HW_AD1815: return "AD1815"; case AD1816A_HW_AD1815: return "AD1815";
case AD1816A_HW_AD18MAX10: return "AD18max10"; case AD1816A_HW_AD18MAX10: return "AD18max10";
default: default:
snd_printk(KERN_WARNING "Unknown chip version %d:%d.\n", dev_warn(chip->card->dev, "Unknown chip version %d:%d.\n",
chip->version, chip->hardware); chip->version, chip->hardware);
return "AD1816A - unknown"; return "AD1816A - unknown";
} }
} }
@ -566,23 +566,23 @@ int snd_ad1816a_create(struct snd_card *card,
chip->res_port = devm_request_region(card->dev, port, 16, "AD1816A"); chip->res_port = devm_request_region(card->dev, port, 16, "AD1816A");
if (!chip->res_port) { if (!chip->res_port) {
snd_printk(KERN_ERR "ad1816a: can't grab port 0x%lx\n", port); dev_err(card->dev, "ad1816a: can't grab port 0x%lx\n", port);
return -EBUSY; return -EBUSY;
} }
if (devm_request_irq(card->dev, irq, snd_ad1816a_interrupt, 0, if (devm_request_irq(card->dev, irq, snd_ad1816a_interrupt, 0,
"AD1816A", (void *) chip)) { "AD1816A", (void *) chip)) {
snd_printk(KERN_ERR "ad1816a: can't grab IRQ %d\n", irq); dev_err(card->dev, "ad1816a: can't grab IRQ %d\n", irq);
return -EBUSY; return -EBUSY;
} }
chip->irq = irq; chip->irq = irq;
card->sync_irq = chip->irq; card->sync_irq = chip->irq;
if (snd_devm_request_dma(card->dev, dma1, "AD1816A - 1")) { if (snd_devm_request_dma(card->dev, dma1, "AD1816A - 1")) {
snd_printk(KERN_ERR "ad1816a: can't grab DMA1 %d\n", dma1); dev_err(card->dev, "ad1816a: can't grab DMA1 %d\n", dma1);
return -EBUSY; return -EBUSY;
} }
chip->dma1 = dma1; chip->dma1 = dma1;
if (snd_devm_request_dma(card->dev, dma2, "AD1816A - 2")) { if (snd_devm_request_dma(card->dev, dma2, "AD1816A - 2")) {
snd_printk(KERN_ERR "ad1816a: can't grab DMA2 %d\n", dma2); dev_err(card->dev, "ad1816a: can't grab DMA2 %d\n", dma2);
return -EBUSY; return -EBUSY;
} }
chip->dma2 = dma2; chip->dma2 = dma2;