ALSA: es1688: 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.

For referring to the device, introduce snd_card pointer to struct
snd_es1688.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20240807133452.9424-25-tiwai@suse.de

diff --git a/include/sound/es1688.h b/include/sound/es1688.h
index 099569c31fbb3b84ab8f483f22eb393d40d9b5b6..425a3717d77a2e2164bd1aa1997bfa31126b233c 100644 (file)
--- a/include/sound/es1688.h
+++ b/include/sound/es1688.h
@@ -17,6 +17,7 @@
 #define ES1688_HW_UNDEF        0x0003
 
 struct snd_es1688 {
+       struct snd_card *card;
        unsigned long port;             /* port of ESS chip */
        struct resource *res_port;
        unsigned long mpu_port;         /* MPU-401 port of ESS chip */

diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index 97728bf45474238d500aaead219a8d5e3396ae00..6a95dfb7600a3bc7333fdabaafbcb7d79ed75dac 100644 (file)
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
@@ -213,7 +213,7 @@ static int snd_card_es968_pnp(struct snd_card *card, unsigned int n,
 
        error = pnp_activate_dev(pdev);
        if (error < 0) {
-               snd_printk(KERN_ERR "ES968 pnp configure failure\n");
+               dev_err(card->dev, "ES968 pnp configure failure\n");
                return error;
        }
        port[n] = pnp_port_start(pdev, 0);

diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c
index 8554cb2263c1f9d696a25a9d0e701c175cf04008..c0c230149a750d9a6d79bdaf662c54f73fc3e41b 100644 (file)
--- a/sound/isa/es1688/es1688_lib.c
+++ b/sound/isa/es1688/es1688_lib.c
@@ -30,9 +30,7 @@ static int snd_es1688_dsp_command(struct snd_es1688 *chip, unsigned char val)
                        outb(val, ES1688P(chip, COMMAND));
                        return 1;
                }
-#ifdef CONFIG_SND_DEBUG
-       printk(KERN_DEBUG "snd_es1688_dsp_command: timeout (0x%x)\n", val);
-#endif
+       dev_dbg(chip->card->dev, "%s: timeout (0x%x)\n", __func__, val);
        return 0;
 }
 
@@ -43,7 +41,8 @@ static int snd_es1688_dsp_get_byte(struct snd_es1688 *chip)
        for (i = 1000; i; i--)
                if (inb(ES1688P(chip, DATA_AVAIL)) & 0x80)
                        return inb(ES1688P(chip, READ));
-       snd_printd("es1688 get byte failed: 0x%lx = 0x%x!!!\n", ES1688P(chip, DATA_AVAIL), inb(ES1688P(chip, DATA_AVAIL)));
+       dev_dbg(chip->card->dev, "es1688 get byte failed: 0x%lx = 0x%x!!!\n",
+               ES1688P(chip, DATA_AVAIL), inb(ES1688P(chip, DATA_AVAIL)));
        return -ENODEV;
 }
 
@@ -95,7 +94,8 @@ int snd_es1688_reset(struct snd_es1688 *chip)
        udelay(30);
        for (i = 0; i < 1000 && !(inb(ES1688P(chip, DATA_AVAIL)) & 0x80); i++);
        if (inb(ES1688P(chip, READ)) != 0xaa) {
-               snd_printd("ess_reset at 0x%lx: failed!!!\n", chip->port);
+               dev_dbg(chip->card->dev, "ess_reset at 0x%lx: failed!!!\n",
+                       chip->port);
                return -ENODEV;
        }
        snd_es1688_dsp_command(chip, 0xc6);     /* enable extended mode */
@@ -127,7 +127,8 @@ static int snd_es1688_probe(struct snd_es1688 *chip)
        inb(ES1688P(chip, ENABLE0));    /* ENABLE0 */
 
        if (snd_es1688_reset(chip) < 0) {
-               snd_printdd("ESS: [0x%lx] reset failed... 0x%x\n", chip->port, inb(ES1688P(chip, READ)));
+               dev_dbg(chip->card->dev, "ESS: [0x%lx] reset failed... 0x%x\n",
+                       chip->port, inb(ES1688P(chip, READ)));
                spin_unlock_irqrestore(&chip->reg_lock, flags);
                return -ENODEV;
        }
@@ -145,7 +146,9 @@ static int snd_es1688_probe(struct snd_es1688 *chip)
 
        spin_unlock_irqrestore(&chip->reg_lock, flags);
 
-       snd_printdd("ESS: [0x%lx] found.. major = 0x%x, minor = 0x%x\n", chip->port, major, minor);
+       dev_dbg(chip->card->dev,
+               "ESS: [0x%lx] found.. major = 0x%x, minor = 0x%x\n",
+               chip->port, major, minor);
 
        chip->version = (major << 8) | minor;
        if (!chip->version)
@@ -153,15 +156,16 @@ static int snd_es1688_probe(struct snd_es1688 *chip)
 
        switch (chip->version & 0xfff0) {
        case 0x4880:
-               snd_printk(KERN_ERR "[0x%lx] ESS: AudioDrive ES488 detected, "
-                          "but driver is in another place\n", chip->port);
+               dev_err(chip->card->dev,
+                       "[0x%lx] ESS: AudioDrive ES488 detected, but driver is in another place\n",
+                       chip->port);
                return -ENODEV;
        case 0x6880:
                break;
        default:
-               snd_printk(KERN_ERR "[0x%lx] ESS: unknown AudioDrive chip "
-                          "with version 0x%x (Jazz16 soundcard?)\n",
-                          chip->port, chip->version);
+               dev_err(chip->card->dev,
+                       "[0x%lx] ESS: unknown AudioDrive chip with version 0x%x (Jazz16 soundcard?)\n",
+                       chip->port, chip->version);
                return -ENODEV;
        }
 
@@ -210,9 +214,6 @@ static int snd_es1688_init(struct snd_es1688 * chip, int enable)
                        }
                }
        }
-#if 0
-       snd_printk(KERN_DEBUG "mpu cfg = 0x%x\n", cfg);
-#endif
        spin_lock_irqsave(&chip->reg_lock, flags);
        snd_es1688_mixer_write(chip, 0x40, cfg);
        spin_unlock_irqrestore(&chip->reg_lock, flags);
@@ -225,9 +226,9 @@ static int snd_es1688_init(struct snd_es1688 * chip, int enable)
                cfg = 0xf0;     /* enable only DMA counter interrupt */
                irq_bits = irqs[chip->irq & 0x0f];
                if (irq_bits < 0) {
-                       snd_printk(KERN_ERR "[0x%lx] ESS: bad IRQ %d "
-                                  "for ES1688 chip!!\n",
-                                  chip->port, chip->irq);
+                       dev_err(chip->card->dev,
+                               "[0x%lx] ESS: bad IRQ %d for ES1688 chip!!\n",
+                               chip->port, chip->irq);
 #if 0
                        irq_bits = 0;
                        cfg = 0x10;
@@ -240,8 +241,9 @@ static int snd_es1688_init(struct snd_es1688 * chip, int enable)
                cfg = 0xf0;     /* extended mode DMA enable */
                dma = chip->dma8;
                if (dma > 3 || dma == 2) {
-                       snd_printk(KERN_ERR "[0x%lx] ESS: bad DMA channel %d "
-                                  "for ES1688 chip!!\n", chip->port, dma);
+                       dev_err(chip->card->dev,
+                               "[0x%lx] ESS: bad DMA channel %d for ES1688 chip!!\n",
+                               chip->port, dma);
 #if 0
                        dma_bits = 0;
                        cfg = 0x00;     /* disable all DMA */
@@ -326,9 +328,9 @@ static int snd_es1688_trigger(struct snd_es1688 *chip, int cmd, unsigned char va
                return -EINVAL; /* something is wrong */
        }
 #if 0
-       printk(KERN_DEBUG "trigger: val = 0x%x, value = 0x%x\n", val, value);
-       printk(KERN_DEBUG "trigger: pointer = 0x%x\n",
-              snd_dma_pointer(chip->dma8, chip->dma_size));
+       dev_dbg(chip->card->dev, "trigger: val = 0x%x, value = 0x%x\n", val, value);
+       dev_dbg(chip->card->dev, "trigger: pointer = 0x%x\n",
+               snd_dma_pointer(chip->dma8, chip->dma_size));
 #endif
        snd_es1688_write(chip, 0xb8, (val & 0xf0) | value);
        spin_unlock(&chip->reg_lock);
@@ -620,20 +622,21 @@ int snd_es1688_create(struct snd_card *card,
 
        if (chip == NULL)
                return -ENOMEM;
+       chip->card = card;
        chip->irq = -1;
        chip->dma8 = -1;
        chip->hardware = ES1688_HW_UNDEF;
        
        chip->res_port = request_region(port + 4, 12, "ES1688");
        if (chip->res_port == NULL) {
-               snd_printk(KERN_ERR "es1688: can't grab port 0x%lx\n", port + 4);
+               dev_err(card->dev, "es1688: can't grab port 0x%lx\n", port + 4);
                err = -EBUSY;
                goto exit;
        }
 
        err = request_irq(irq, snd_es1688_interrupt, 0, "ES1688", (void *) chip);
        if (err < 0) {
-               snd_printk(KERN_ERR "es1688: can't grab IRQ %d\n", irq);
+               dev_err(card->dev, "es1688: can't grab IRQ %d\n", irq);
                goto exit;
        }
 
@@ -642,7 +645,7 @@ int snd_es1688_create(struct snd_card *card,
        err = request_dma(dma8, "ES1688");
 
        if (err < 0) {
-               snd_printk(KERN_ERR "es1688: can't grab DMA8 %d\n", dma8);
+               dev_err(card->dev, "es1688: can't grab DMA8 %d\n", dma8);
                goto exit;
        }
        chip->dma8 = dma8;