ALSA: sparc: 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-52-tiwai@suse.de

diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index 0fea04acc3eaa54e2612da72ef5a7757bcf91e53..9bdf3db51d629360c727801ad4eaadd172d16935 100644 (file)
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -935,8 +935,8 @@ static int snd_amd7930_create(struct snd_card *card,
        amd->regs = of_ioremap(&op->resource[0], 0,
                               resource_size(&op->resource[0]), "amd7930");
        if (!amd->regs) {
-               snd_printk(KERN_ERR
-                          "amd7930-%d: Unable to map chip registers.\n", dev);
+               dev_err(card->dev,
+                       "amd7930-%d: Unable to map chip registers.\n", dev);
                kfree(amd);
                return -EIO;
        }
@@ -945,8 +945,8 @@ static int snd_amd7930_create(struct snd_card *card,
 
        if (request_irq(irq, snd_amd7930_interrupt,
                        IRQF_SHARED, "amd7930", amd)) {
-               snd_printk(KERN_ERR "amd7930-%d: Unable to grab IRQ %d\n",
-                          dev, irq);
+               dev_err(card->dev, "amd7930-%d: Unable to grab IRQ %d\n",
+                       dev, irq);
                snd_amd7930_free(amd);
                return -EBUSY;
        }

diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index c2ad3fa2f25a9dbd92c27c936cee0bee913d01ea..5f39b7847d31ef08f1090e0b9e9b7b54bc9ba015 100644 (file)
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -292,9 +292,9 @@ static void snd_cs4231_dout(struct snd_cs4231 *chip, unsigned char reg,
        snd_cs4231_ready(chip);
 #ifdef CONFIG_SND_DEBUG
        if (__cs4231_readb(chip, CS4231U(chip, REGSEL)) & CS4231_INIT)
-               snd_printdd("out: auto calibration time out - reg = 0x%x, "
-                           "value = 0x%x\n",
-                           reg, value);
+               dev_dbg(chip->card->dev,
+                       "out: auto calibration time out - reg = 0x%x, value = 0x%x\n",
+                       reg, value);
 #endif
        __cs4231_writeb(chip, chip->mce_bit | reg, CS4231U(chip, REGSEL));
        wmb();
@@ -325,8 +325,9 @@ static unsigned char snd_cs4231_in(struct snd_cs4231 *chip, unsigned char reg)
        snd_cs4231_ready(chip);
 #ifdef CONFIG_SND_DEBUG
        if (__cs4231_readb(chip, CS4231U(chip, REGSEL)) & CS4231_INIT)
-               snd_printdd("in: auto calibration time out - reg = 0x%x\n",
-                           reg);
+               dev_dbg(chip->card->dev,
+                       "in: auto calibration time out - reg = 0x%x\n",
+                       reg);
 #endif
        __cs4231_writeb(chip, chip->mce_bit | reg, CS4231U(chip, REGSEL));
        mb();
@@ -363,14 +364,15 @@ static void snd_cs4231_mce_up(struct snd_cs4231 *chip)
        snd_cs4231_ready(chip);
 #ifdef CONFIG_SND_DEBUG
        if (__cs4231_readb(chip, CS4231U(chip, REGSEL)) & CS4231_INIT)
-               snd_printdd("mce_up - auto calibration time out (0)\n");
+               dev_dbg(chip->card->dev,
+                       "mce_up - auto calibration time out (0)\n");
 #endif
        chip->mce_bit |= CS4231_MCE;
        timeout = __cs4231_readb(chip, CS4231U(chip, REGSEL));
        if (timeout == 0x80)
-               snd_printdd("mce_up [%p]: serious init problem - "
-                           "codec still busy\n",
-                           chip->port);
+               dev_dbg(chip->card->dev,
+                       "mce_up [%p]: serious init problem - codec still busy\n",
+                       chip->port);
        if (!(timeout & CS4231_MCE))
                __cs4231_writeb(chip, chip->mce_bit | (timeout & 0x1f),
                                CS4231U(chip, REGSEL));
@@ -386,16 +388,18 @@ static void snd_cs4231_mce_down(struct snd_cs4231 *chip)
        spin_lock_irqsave(&chip->lock, flags);
 #ifdef CONFIG_SND_DEBUG
        if (__cs4231_readb(chip, CS4231U(chip, REGSEL)) & CS4231_INIT)
-               snd_printdd("mce_down [%p] - auto calibration time out (0)\n",
-                           CS4231U(chip, REGSEL));
+               dev_dbg(chip->card->dev,
+                       "mce_down [%p] - auto calibration time out (0)\n",
+                       CS4231U(chip, REGSEL));
 #endif
        chip->mce_bit &= ~CS4231_MCE;
        reg = __cs4231_readb(chip, CS4231U(chip, REGSEL));
        __cs4231_writeb(chip, chip->mce_bit | (reg & 0x1f),
                        CS4231U(chip, REGSEL));
        if (reg == 0x80)
-               snd_printdd("mce_down [%p]: serious init problem "
-                           "- codec still busy\n", chip->port);
+               dev_dbg(chip->card->dev,
+                       "mce_down [%p]: serious init problem - codec still busy\n",
+                       chip->port);
        if ((reg & CS4231_MCE) == 0) {
                spin_unlock_irqrestore(&chip->lock, flags);
                return;
@@ -415,8 +419,8 @@ static void snd_cs4231_mce_down(struct snd_cs4231 *chip)
        spin_unlock_irqrestore(&chip->lock, flags);
 
        if (reg)
-               snd_printk(KERN_ERR
-                          "mce_down - auto calibration time out (2)\n");
+               dev_err(chip->card->dev,
+                       "mce_down - auto calibration time out (2)\n");
 }
 
 static void snd_cs4231_advance_dma(struct cs4231_dma_control *dma_cont,
@@ -710,7 +714,7 @@ static void snd_cs4231_init(struct snd_cs4231 *chip)
        snd_cs4231_mce_down(chip);
 
 #ifdef SNDRV_DEBUG_MCE
-       snd_printdd("init: (1)\n");
+       pr_debug("init: (1)\n");
 #endif
        snd_cs4231_mce_up(chip);
        spin_lock_irqsave(&chip->lock, flags);
@@ -725,7 +729,7 @@ static void snd_cs4231_init(struct snd_cs4231 *chip)
        snd_cs4231_mce_down(chip);
 
 #ifdef SNDRV_DEBUG_MCE
-       snd_printdd("init: (2)\n");
+       pr_debug("init: (2)\n");
 #endif
 
        snd_cs4231_mce_up(chip);
@@ -736,8 +740,8 @@ static void snd_cs4231_init(struct snd_cs4231 *chip)
        snd_cs4231_mce_down(chip);
 
 #ifdef SNDRV_DEBUG_MCE
-       snd_printdd("init: (3) - afei = 0x%x\n",
-                   chip->image[CS4231_ALT_FEATURE_1]);
+       pr_debug("init: (3) - afei = 0x%x\n",
+                chip->image[CS4231_ALT_FEATURE_1]);
 #endif
 
        spin_lock_irqsave(&chip->lock, flags);
@@ -753,7 +757,7 @@ static void snd_cs4231_init(struct snd_cs4231 *chip)
        snd_cs4231_mce_down(chip);
 
 #ifdef SNDRV_DEBUG_MCE
-       snd_printdd("init: (4)\n");
+       pr_debug("init: (4)\n");
 #endif
 
        snd_cs4231_mce_up(chip);
@@ -763,7 +767,7 @@ static void snd_cs4231_init(struct snd_cs4231 *chip)
        snd_cs4231_mce_down(chip);
 
 #ifdef SNDRV_DEBUG_MCE
-       snd_printdd("init: (5)\n");
+       pr_debug("init: (5)\n");
 #endif
 }
 
@@ -1038,7 +1042,8 @@ static int snd_cs4231_probe(struct snd_cs4231 *chip)
                                break;  /* this is valid value */
                }
        }
-       snd_printdd("cs4231: port = %p, id = 0x%x\n", chip->port, id);
+       dev_dbg(chip->card->dev,
+               "cs4231: port = %p, id = 0x%x\n", chip->port, id);
        if (id != 0x0a)
                return -ENODEV; /* no valid device found */
 
@@ -1794,7 +1799,8 @@ static int snd_cs4231_sbus_create(struct snd_card *card,
        chip->port = of_ioremap(&op->resource[0], 0,
                                chip->regs_size, "cs4231");
        if (!chip->port) {
-               snd_printdd("cs4231-%d: Unable to map chip registers.\n", dev);
+               dev_dbg(chip->card->dev,
+                       "cs4231-%d: Unable to map chip registers.\n", dev);
                return -EIO;
        }
 
@@ -1815,8 +1821,9 @@ static int snd_cs4231_sbus_create(struct snd_card *card,
 
        if (request_irq(op->archdata.irqs[0], snd_cs4231_sbus_interrupt,
                        IRQF_SHARED, "cs4231", chip)) {
-               snd_printdd("cs4231-%d: Unable to grab SBUS IRQ %d\n",
-                           dev, op->archdata.irqs[0]);
+               dev_dbg(chip->card->dev,
+                       "cs4231-%d: Unable to grab SBUS IRQ %d\n",
+                       dev, op->archdata.irqs[0]);
                snd_cs4231_sbus_free(chip);
                return -EBUSY;
        }
@@ -1986,32 +1993,37 @@ static int snd_cs4231_ebus_create(struct snd_card *card,
        if (!chip->port || !chip->p_dma.ebus_info.regs ||
            !chip->c_dma.ebus_info.regs) {
                snd_cs4231_ebus_free(chip);
-               snd_printdd("cs4231-%d: Unable to map chip registers.\n", dev);
+               dev_dbg(chip->card->dev,
+                       "cs4231-%d: Unable to map chip registers.\n", dev);
                return -EIO;
        }
 
        if (ebus_dma_register(&chip->c_dma.ebus_info)) {
                snd_cs4231_ebus_free(chip);
-               snd_printdd("cs4231-%d: Unable to register EBUS capture DMA\n",
-                           dev);
+               dev_dbg(chip->card->dev,
+                       "cs4231-%d: Unable to register EBUS capture DMA\n",
+                       dev);
                return -EBUSY;
        }
        if (ebus_dma_irq_enable(&chip->c_dma.ebus_info, 1)) {
                snd_cs4231_ebus_free(chip);
-               snd_printdd("cs4231-%d: Unable to enable EBUS capture IRQ\n",
-                           dev);
+               dev_dbg(chip->card->dev,
+                       "cs4231-%d: Unable to enable EBUS capture IRQ\n",
+                       dev);
                return -EBUSY;
        }
 
        if (ebus_dma_register(&chip->p_dma.ebus_info)) {
                snd_cs4231_ebus_free(chip);
-               snd_printdd("cs4231-%d: Unable to register EBUS play DMA\n",
-                           dev);
+               dev_dbg(chpi->card->dev,
+                       "cs4231-%d: Unable to register EBUS play DMA\n",
+                       dev);
                return -EBUSY;
        }
        if (ebus_dma_irq_enable(&chip->p_dma.ebus_info, 1)) {
                snd_cs4231_ebus_free(chip);
-               snd_printdd("cs4231-%d: Unable to enable EBUS play IRQ\n", dev);
+               dev_dbg(chip->card->dev,
+                       "cs4231-%d: Unable to enable EBUS play IRQ\n", dev);
                return -EBUSY;
        }