ALSA: pdaudiocf: 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-49-tiwai@suse.de

diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c
index 8363ec08df5d9697e5a48ee80b175f96dfc1b089..4944607466146821d8b7120dee6db17b5c557d4b 100644 (file)
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c
@@ -85,14 +85,13 @@ static int snd_pdacf_probe(struct pcmcia_device *link)
                .dev_free =     snd_pdacf_dev_free,
        };
 
-       snd_printdd(KERN_DEBUG "pdacf_attach called\n");
        /* find an empty slot from the card list */
        for (i = 0; i < SNDRV_CARDS; i++) {
                if (! card_list[i])
                        break;
        }
        if (i >= SNDRV_CARDS) {
-               snd_printk(KERN_ERR "pdacf: too many cards found\n");
+               dev_err(&link->dev, "pdacf: too many cards found\n");
                return -EINVAL;
        }
        if (! enable[i])
@@ -102,7 +101,7 @@ static int snd_pdacf_probe(struct pcmcia_device *link)
        err = snd_card_new(&link->dev, index[i], id[i], THIS_MODULE,
                           0, &card);
        if (err < 0) {
-               snd_printk(KERN_ERR "pdacf: cannot create a card instance\n");
+               dev_err(&link->dev, "pdacf: cannot create a card instance\n");
                return err;
        }
 
@@ -152,7 +151,7 @@ static int snd_pdacf_assign_resources(struct snd_pdacf *pdacf, int port, int irq
        int err;
        struct snd_card *card = pdacf->card;
 
-       snd_printdd(KERN_DEBUG "pdacf assign resources: port = 0x%x, irq = %d\n", port, irq);
+       dev_dbg(card->dev, "pdacf assign resources: port = 0x%x, irq = %d\n", port, irq);
        pdacf->port = port;
        pdacf->irq = irq;
        pdacf->chip_status |= PDAUDIOCF_STAT_IS_CONFIGURED;
@@ -185,8 +184,6 @@ static void snd_pdacf_detach(struct pcmcia_device *link)
 {
        struct snd_pdacf *chip = link->priv;
 
-       snd_printdd(KERN_DEBUG "pdacf_detach called\n");
-
        if (chip->chip_status & PDAUDIOCF_STAT_IS_CONFIGURED)
                snd_pdacf_powerdown(chip);
        chip->chip_status |= PDAUDIOCF_STAT_IS_STALE; /* to be sure */
@@ -203,7 +200,6 @@ static int pdacf_config(struct pcmcia_device *link)
        struct snd_pdacf *pdacf = link->priv;
        int ret;
 
-       snd_printdd(KERN_DEBUG "pdacf_config called\n");
        link->config_index = 0x5;
        link->config_flags |= CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ;
 
@@ -241,11 +237,8 @@ static int pdacf_suspend(struct pcmcia_device *link)
 {
        struct snd_pdacf *chip = link->priv;
 
-       snd_printdd(KERN_DEBUG "SUSPEND\n");
-       if (chip) {
-               snd_printdd(KERN_DEBUG "snd_pdacf_suspend calling\n");
+       if (chip)
                snd_pdacf_suspend(chip);
-       }
 
        return 0;
 }
@@ -254,14 +247,10 @@ static int pdacf_resume(struct pcmcia_device *link)
 {
        struct snd_pdacf *chip = link->priv;
 
-       snd_printdd(KERN_DEBUG "RESUME\n");
        if (pcmcia_dev_present(link)) {
-               if (chip) {
-                       snd_printdd(KERN_DEBUG "calling snd_pdacf_resume\n");
+               if (chip)
                        snd_pdacf_resume(chip);
-               }
        }
-       snd_printdd(KERN_DEBUG "resume done!\n");
 
        return 0;
 }

diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
index 5537c0882aa55da93c3a1460b312697b9b0bb76b..11aacc7e3f0b033f33f335bedd40560033a09136 100644 (file)
--- a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
@@ -28,7 +28,7 @@ static unsigned char pdacf_ak4117_read(void *private_data, unsigned char reg)
                udelay(5);
                if (--timeout == 0) {
                        spin_unlock_irqrestore(&chip->ak4117_lock, flags);
-                       snd_printk(KERN_ERR "AK4117 ready timeout (read)\n");
+                       dev_err(chip->card->dev, "AK4117 ready timeout (read)\n");
                        return 0;
                }
        }
@@ -38,7 +38,7 @@ static unsigned char pdacf_ak4117_read(void *private_data, unsigned char reg)
                udelay(5);
                if (--timeout == 0) {
                        spin_unlock_irqrestore(&chip->ak4117_lock, flags);
-                       snd_printk(KERN_ERR "AK4117 read timeout (read2)\n");
+                       dev_err(chip->card->dev, "AK4117 read timeout (read2)\n");
                        return 0;
                }
        }
@@ -59,7 +59,7 @@ static void pdacf_ak4117_write(void *private_data, unsigned char reg, unsigned c
                udelay(5);
                if (--timeout == 0) {
                        spin_unlock_irqrestore(&chip->ak4117_lock, flags);
-                       snd_printk(KERN_ERR "AK4117 ready timeout (write)\n");
+                       dev_err(chip->card->dev, "AK4117 ready timeout (write)\n");
                        return;
                }
        }
@@ -70,21 +70,21 @@ static void pdacf_ak4117_write(void *private_data, unsigned char reg, unsigned c
 #if 0
 void pdacf_dump(struct snd_pdacf *chip)
 {
-       printk(KERN_DEBUG "PDAUDIOCF DUMP (0x%lx):\n", chip->port);
-       printk(KERN_DEBUG "WPD         : 0x%x\n",
-              inw(chip->port + PDAUDIOCF_REG_WDP));
-       printk(KERN_DEBUG "RDP         : 0x%x\n",
-              inw(chip->port + PDAUDIOCF_REG_RDP));
-       printk(KERN_DEBUG "TCR         : 0x%x\n",
-              inw(chip->port + PDAUDIOCF_REG_TCR));
-       printk(KERN_DEBUG "SCR         : 0x%x\n",
-              inw(chip->port + PDAUDIOCF_REG_SCR));
-       printk(KERN_DEBUG "ISR         : 0x%x\n",
-              inw(chip->port + PDAUDIOCF_REG_ISR));
-       printk(KERN_DEBUG "IER         : 0x%x\n",
-              inw(chip->port + PDAUDIOCF_REG_IER));
-       printk(KERN_DEBUG "AK_IFR      : 0x%x\n",
-              inw(chip->port + PDAUDIOCF_REG_AK_IFR));
+       dev_dbg(chip->card->dev, "PDAUDIOCF DUMP (0x%lx):\n", chip->port);
+       dev_dbg(chip->card->dev, "WPD         : 0x%x\n",
+               inw(chip->port + PDAUDIOCF_REG_WDP));
+       dev_dbg(chip->card->dev, "RDP         : 0x%x\n",
+               inw(chip->port + PDAUDIOCF_REG_RDP));
+       dev_dbg(chip->card->dev, "TCR         : 0x%x\n",
+               inw(chip->port + PDAUDIOCF_REG_TCR));
+       dev_dbg(chip->card->dev, "SCR         : 0x%x\n",
+               inw(chip->port + PDAUDIOCF_REG_SCR));
+       dev_dbg(chip->card->dev, "ISR         : 0x%x\n",
+               inw(chip->port + PDAUDIOCF_REG_ISR));
+       dev_dbg(chip->card->dev, "IER         : 0x%x\n",
+               inw(chip->port + PDAUDIOCF_REG_IER));
+       dev_dbg(chip->card->dev, "AK_IFR      : 0x%x\n",
+               inw(chip->port + PDAUDIOCF_REG_AK_IFR));
 }
 #endif
 

diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
index f134b4a4622fb8de321afadc7eadbea81c44fa09..af40a2c8789a6bc9882995f55d3569cbfbad8750 100644 (file)
--- a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
@@ -27,7 +27,7 @@ irqreturn_t pdacf_interrupt(int irq, void *dev)
        stat = inw(chip->port + PDAUDIOCF_REG_ISR);
        if (stat & (PDAUDIOCF_IRQLVL|PDAUDIOCF_IRQOVR)) {
                if (stat & PDAUDIOCF_IRQOVR)    /* should never happen */
-                       snd_printk(KERN_ERR "PDAUDIOCF SRAM buffer overrun detected!\n");
+                       dev_err(chip->card->dev, "PDAUDIOCF SRAM buffer overrun detected!\n");
                if (chip->pcm_substream)
                        wake_thread = true;
                if (!(stat & PDAUDIOCF_IRQAKM))
@@ -257,7 +257,6 @@ irqreturn_t pdacf_threaded_irq(int irq, void *dev)
 
        rdp = inw(chip->port + PDAUDIOCF_REG_RDP);
        wdp = inw(chip->port + PDAUDIOCF_REG_WDP);
-       /* printk(KERN_DEBUG "TASKLET: rdp = %x, wdp = %x\n", rdp, wdp); */
        size = wdp - rdp;
        if (size < 0)
                size += 0x10000;