ALSA: cmi8328: Use standard print API

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-22-tiwai@suse.de

diff --git a/sound/isa/cmi8328.c b/sound/isa/cmi8328.c
index 8902cfb830f7af848b7406e153fbcb07480b76ca..d30cce4cc7e39d206ec92bcae32b656fb0a89df9 100644 (file)
--- a/sound/isa/cmi8328.c
+++ b/sound/isa/cmi8328.c
@@ -159,7 +159,7 @@ static int snd_cmi8328_mixer(struct snd_wss *chip)
        strcpy(id2.name, "CD Playback Switch");
        err = snd_ctl_rename_id(card, &id1, &id2);
        if (err < 0) {
-               snd_printk(KERN_ERR "error renaming control\n");
+               dev_err(card->dev, "error renaming control\n");
                return err;
        }
        /* rename AUX0 volume to CD */
@@ -167,7 +167,7 @@ static int snd_cmi8328_mixer(struct snd_wss *chip)
        strcpy(id2.name, "CD Playback Volume");
        err = snd_ctl_rename_id(card, &id1, &id2);
        if (err < 0) {
-               snd_printk(KERN_ERR "error renaming control\n");
+               dev_err(card->dev, "error renaming control\n");
                return err;
        }
        /* rename AUX1 switch to Synth */
@@ -176,7 +176,7 @@ static int snd_cmi8328_mixer(struct snd_wss *chip)
        strcpy(id2.name, "Synth Playback Switch");
        err = snd_ctl_rename_id(card, &id1, &id2);
        if (err < 0) {
-               snd_printk(KERN_ERR "error renaming control\n");
+               dev_err(card->dev, "error renaming control\n");
                return err;
        }
        /* rename AUX1 volume to Synth */
@@ -185,7 +185,7 @@ static int snd_cmi8328_mixer(struct snd_wss *chip)
        strcpy(id2.name, "Synth Playback Volume");
        err = snd_ctl_rename_id(card, &id1, &id2);
        if (err < 0) {
-               snd_printk(KERN_ERR "error renaming control\n");
+               dev_err(card->dev, "error renaming control\n");
                return err;
        }
 
@@ -251,35 +251,35 @@ static int snd_cmi8328_probe(struct device *pdev, unsigned int ndev)
        if (irq[ndev] == SNDRV_AUTO_IRQ) {
                irq[ndev] = snd_legacy_find_free_irq(irqs);
                if (irq[ndev] < 0) {
-                       snd_printk(KERN_ERR "unable to find a free IRQ\n");
+                       dev_err(pdev, "unable to find a free IRQ\n");
                        return -EBUSY;
                }
        }
        if (dma1[ndev] == SNDRV_AUTO_DMA) {
                dma1[ndev] = snd_legacy_find_free_dma(dma1s);
                if (dma1[ndev] < 0) {
-                       snd_printk(KERN_ERR "unable to find a free DMA1\n");
+                       dev_err(pdev, "unable to find a free DMA1\n");
                        return -EBUSY;
                }
        }
        if (dma2[ndev] == SNDRV_AUTO_DMA) {
                dma2[ndev] = snd_legacy_find_free_dma(dma2s[dma1[ndev] % 4]);
                if (dma2[ndev] < 0) {
-                       snd_printk(KERN_WARNING "unable to find a free DMA2, full-duplex will not work\n");
+                       dev_warn(pdev, "unable to find a free DMA2, full-duplex will not work\n");
                        dma2[ndev] = -1;
                }
        }
        /* configure WSS IRQ... */
        pos = array_find(irqs, irq[ndev]);
        if (pos < 0) {
-               snd_printk(KERN_ERR "invalid IRQ %d\n", irq[ndev]);
+               dev_err(pdev, "invalid IRQ %d\n", irq[ndev]);
                return -EINVAL;
        }
        val = irq_bits[pos] << 3;
        /* ...and DMA... */
        pos = array_find(dma1s, dma1[ndev]);
        if (pos < 0) {
-               snd_printk(KERN_ERR "invalid DMA1 %d\n", dma1[ndev]);
+               dev_err(pdev, "invalid DMA1 %d\n", dma1[ndev]);
                return -EINVAL;
        }
        val |= dma_bits[pos];
@@ -287,7 +287,7 @@ static int snd_cmi8328_probe(struct device *pdev, unsigned int ndev)
        if (dma2[ndev] >= 0 && dma1[ndev] != dma2[ndev]) {
                pos = array_find(dma2s[dma1[ndev]], dma2[ndev]);
                if (pos < 0) {
-                       snd_printk(KERN_ERR "invalid DMA2 %d\n", dma2[ndev]);
+                       dev_err(pdev, "invalid DMA2 %d\n", dma2[ndev]);
                        return -EINVAL;
                }
                val |= 0x04; /* enable separate capture DMA */
@@ -320,47 +320,47 @@ static int snd_cmi8328_probe(struct device *pdev, unsigned int ndev)
                return err;
 
        if (snd_wss_timer(cmi->wss, 0) < 0)
-               snd_printk(KERN_WARNING "error initializing WSS timer\n");
+               dev_warn(pdev, "error initializing WSS timer\n");
 
        if (mpuport[ndev] == SNDRV_AUTO_PORT) {
                mpuport[ndev] = snd_legacy_find_free_ioport(mpu_ports, 2);
                if (mpuport[ndev] < 0)
-                       snd_printk(KERN_ERR "unable to find a free MPU401 port\n");
+                       dev_err(pdev, "unable to find a free MPU401 port\n");
        }
        if (mpuirq[ndev] == SNDRV_AUTO_IRQ) {
                mpuirq[ndev] = snd_legacy_find_free_irq(mpu_irqs);
                if (mpuirq[ndev] < 0)
-                       snd_printk(KERN_ERR "unable to find a free MPU401 IRQ\n");
+                       dev_err(pdev, "unable to find a free MPU401 IRQ\n");
        }
        /* enable and configure MPU401 */
        if (mpuport[ndev] > 0 && mpuirq[ndev] > 0) {
                val = CFG2_MPU_ENABLE;
                pos = array_find_l(mpu_ports, mpuport[ndev]);
                if (pos < 0)
-                       snd_printk(KERN_WARNING "invalid MPU401 port 0x%lx\n",
-                                                               mpuport[ndev]);
+                       dev_warn(pdev, "invalid MPU401 port 0x%lx\n",
+                                mpuport[ndev]);
                else {
                        val |= mpu_port_bits[pos] << 5;
                        pos = array_find(mpu_irqs, mpuirq[ndev]);
                        if (pos < 0)
-                               snd_printk(KERN_WARNING "invalid MPU401 IRQ %d\n",
-                                                               mpuirq[ndev]);
+                               dev_warn(pdev, "invalid MPU401 IRQ %d\n",
+                                        mpuirq[ndev]);
                        else {
                                val |= mpu_irq_bits[pos] << 3;
                                snd_cmi8328_cfg_write(port, CFG2, val);
                                if (snd_mpu401_uart_new(card, 0,
                                                MPU401_HW_MPU401, mpuport[ndev],
                                                0, mpuirq[ndev], NULL) < 0)
-                                       snd_printk(KERN_ERR "error initializing MPU401\n");
+                                       dev_err(pdev, "error initializing MPU401\n");
                        }
                }
        }
        /* OPL3 is hardwired to 0x388 and cannot be disabled */
        if (snd_opl3_create(card, 0x388, 0x38a, OPL3_HW_AUTO, 0, &opl3) < 0)
-               snd_printk(KERN_ERR "error initializing OPL3\n");
+               dev_err(pdev, "error initializing OPL3\n");
        else
                if (snd_opl3_hwdep_new(opl3, 0, 1, NULL) < 0)
-                       snd_printk(KERN_WARNING "error initializing OPL3 hwdep\n");
+                       dev_warn(pdev, "error initializing OPL3 hwdep\n");
 
        strcpy(card->driver, "CMI8328");
        strcpy(card->shortname, "C-Media CMI8328");
@@ -378,7 +378,7 @@ static int snd_cmi8328_probe(struct device *pdev, unsigned int ndev)
        /* gameport is hardwired to 0x200 */
        res = devm_request_region(pdev, 0x200, 8, "CMI8328 gameport");
        if (!res)
-               snd_printk(KERN_WARNING "unable to allocate gameport I/O port\n");
+               dev_warn(pdev, "unable to allocate gameport I/O port\n");
        else {
                struct gameport *gp = cmi->gameport = gameport_allocate_port();
                if (cmi->gameport) {