Skip to content

L
linux
Commit 7f7eff20 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

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: default avatarJaroslav Kysela <perex@perex.cz>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20240807133452.9424-25-tiwai@suse.de
parent 257d0c81
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 27 deletions
include/sound/es1688.h
View file @ 7f7eff20
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#define ES1688_HW_UNDEF 0x0003 #define ES1688_HW_UNDEF 0x0003
struct snd_es1688 { struct snd_es1688 {
struct snd_card *card;
unsigned long port; /* port of ESS chip */ unsigned long port; /* port of ESS chip */
struct resource *res_port; struct resource *res_port;
unsigned long mpu_port; /* MPU-401 port of ESS chip */ unsigned long mpu_port; /* MPU-401 port of ESS chip */
......
sound/isa/es1688/es1688.c
View file @ 7f7eff20
...@@ -213,7 +213,7 @@ static int snd_card_es968_pnp(struct snd_card *card, unsigned int n, ...@@ -213,7 +213,7 @@ static int snd_card_es968_pnp(struct snd_card *card, unsigned int n,
error = pnp_activate_dev(pdev); error = pnp_activate_dev(pdev);
if (error < 0) { if (error < 0) {
snd_printk(KERN_ERR "ES968 pnp configure failure\n"); dev_err(card->dev, "ES968 pnp configure failure\n");
return error; return error;
} }
port[n] = pnp_port_start(pdev, 0); port[n] = pnp_port_start(pdev, 0);
......
sound/isa/es1688/es1688_lib.c
View file @ 7f7eff20
...@@ -30,9 +30,7 @@ static int snd_es1688_dsp_command(struct snd_es1688 *chip, unsigned char val) ...@@ -30,9 +30,7 @@ static int snd_es1688_dsp_command(struct snd_es1688 *chip, unsigned char val)
outb(val, ES1688P(chip, COMMAND)); outb(val, ES1688P(chip, COMMAND));
return 1; return 1;
} }
#ifdef CONFIG_SND_DEBUG dev_dbg(chip->card->dev, "%s: timeout (0x%x)\n", __func__, val);
printk(KERN_DEBUG "snd_es1688_dsp_command: timeout (0x%x)\n", val);
#endif
return 0; return 0;
} }
...@@ -43,7 +41,8 @@ static int snd_es1688_dsp_get_byte(struct snd_es1688 *chip) ...@@ -43,7 +41,8 @@ static int snd_es1688_dsp_get_byte(struct snd_es1688 *chip)
for (i = 1000; i; i--) for (i = 1000; i; i--)
if (inb(ES1688P(chip, DATA_AVAIL)) & 0x80) if (inb(ES1688P(chip, DATA_AVAIL)) & 0x80)
return inb(ES1688P(chip, READ)); 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; return -ENODEV;
} }
...@@ -95,7 +94,8 @@ int snd_es1688_reset(struct snd_es1688 *chip) ...@@ -95,7 +94,8 @@ int snd_es1688_reset(struct snd_es1688 *chip)
udelay(30); udelay(30);
for (i = 0; i < 1000 && !(inb(ES1688P(chip, DATA_AVAIL)) & 0x80); i++); for (i = 0; i < 1000 && !(inb(ES1688P(chip, DATA_AVAIL)) & 0x80); i++);
if (inb(ES1688P(chip, READ)) != 0xaa) { 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; return -ENODEV;
} }
snd_es1688_dsp_command(chip, 0xc6); /* enable extended mode */ snd_es1688_dsp_command(chip, 0xc6); /* enable extended mode */
...@@ -127,7 +127,8 @@ static int snd_es1688_probe(struct snd_es1688 *chip) ...@@ -127,7 +127,8 @@ static int snd_es1688_probe(struct snd_es1688 *chip)
inb(ES1688P(chip, ENABLE0)); /* ENABLE0 */ inb(ES1688P(chip, ENABLE0)); /* ENABLE0 */
if (snd_es1688_reset(chip) < 0) { 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); spin_unlock_irqrestore(&chip->reg_lock, flags);
return -ENODEV; return -ENODEV;
} }
...@@ -145,7 +146,9 @@ static int snd_es1688_probe(struct snd_es1688 *chip) ...@@ -145,7 +146,9 @@ static int snd_es1688_probe(struct snd_es1688 *chip)
spin_unlock_irqrestore(&chip->reg_lock, flags); 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; chip->version = (major << 8) | minor;
if (!chip->version) if (!chip->version)
...@@ -153,14 +156,15 @@ static int snd_es1688_probe(struct snd_es1688 *chip) ...@@ -153,14 +156,15 @@ static int snd_es1688_probe(struct snd_es1688 *chip)
switch (chip->version & 0xfff0) { switch (chip->version & 0xfff0) {
case 0x4880: case 0x4880:
snd_printk(KERN_ERR "[0x%lx] ESS: AudioDrive ES488 detected, " dev_err(chip->card->dev,
"but driver is in another place\n", chip->port); "[0x%lx] ESS: AudioDrive ES488 detected, but driver is in another place\n",
chip->port);
return -ENODEV; return -ENODEV;
case 0x6880: case 0x6880:
break; break;
default: default:
snd_printk(KERN_ERR "[0x%lx] ESS: unknown AudioDrive chip " dev_err(chip->card->dev,
"with version 0x%x (Jazz16 soundcard?)\n", "[0x%lx] ESS: unknown AudioDrive chip with version 0x%x (Jazz16 soundcard?)\n",
chip->port, chip->version); chip->port, chip->version);
return -ENODEV; return -ENODEV;
} }
...@@ -210,9 +214,6 @@ static int snd_es1688_init(struct snd_es1688 * chip, int enable) ...@@ -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); spin_lock_irqsave(&chip->reg_lock, flags);
snd_es1688_mixer_write(chip, 0x40, cfg); snd_es1688_mixer_write(chip, 0x40, cfg);
spin_unlock_irqrestore(&chip->reg_lock, flags); spin_unlock_irqrestore(&chip->reg_lock, flags);
...@@ -225,8 +226,8 @@ static int snd_es1688_init(struct snd_es1688 * chip, int enable) ...@@ -225,8 +226,8 @@ static int snd_es1688_init(struct snd_es1688 * chip, int enable)
cfg = 0xf0; /* enable only DMA counter interrupt */ cfg = 0xf0; /* enable only DMA counter interrupt */
irq_bits = irqs[chip->irq & 0x0f]; irq_bits = irqs[chip->irq & 0x0f];
if (irq_bits < 0) { if (irq_bits < 0) {
snd_printk(KERN_ERR "[0x%lx] ESS: bad IRQ %d " dev_err(chip->card->dev,
"for ES1688 chip!!\n", "[0x%lx] ESS: bad IRQ %d for ES1688 chip!!\n",
chip->port, chip->irq); chip->port, chip->irq);
#if 0 #if 0
irq_bits = 0; irq_bits = 0;
...@@ -240,8 +241,9 @@ static int snd_es1688_init(struct snd_es1688 * chip, int enable) ...@@ -240,8 +241,9 @@ static int snd_es1688_init(struct snd_es1688 * chip, int enable)
cfg = 0xf0; /* extended mode DMA enable */ cfg = 0xf0; /* extended mode DMA enable */
dma = chip->dma8; dma = chip->dma8;
if (dma > 3 || dma == 2) { if (dma > 3 || dma == 2) {
snd_printk(KERN_ERR "[0x%lx] ESS: bad DMA channel %d " dev_err(chip->card->dev,
"for ES1688 chip!!\n", chip->port, dma); "[0x%lx] ESS: bad DMA channel %d for ES1688 chip!!\n",
chip->port, dma);
#if 0 #if 0
dma_bits = 0; dma_bits = 0;
cfg = 0x00; /* disable all DMA */ cfg = 0x00; /* disable all DMA */
...@@ -326,8 +328,8 @@ static int snd_es1688_trigger(struct snd_es1688 *chip, int cmd, unsigned char va ...@@ -326,8 +328,8 @@ static int snd_es1688_trigger(struct snd_es1688 *chip, int cmd, unsigned char va
return -EINVAL; /* something is wrong */ return -EINVAL; /* something is wrong */
} }
#if 0 #if 0
printk(KERN_DEBUG "trigger: val = 0x%x, value = 0x%x\n", val, value); dev_dbg(chip->card->dev, "trigger: val = 0x%x, value = 0x%x\n", val, value);
printk(KERN_DEBUG "trigger: pointer = 0x%x\n", dev_dbg(chip->card->dev, "trigger: pointer = 0x%x\n",
snd_dma_pointer(chip->dma8, chip->dma_size)); snd_dma_pointer(chip->dma8, chip->dma_size));
#endif #endif
snd_es1688_write(chip, 0xb8, (val & 0xf0) | value); snd_es1688_write(chip, 0xb8, (val & 0xf0) | value);
...@@ -620,20 +622,21 @@ int snd_es1688_create(struct snd_card *card, ...@@ -620,20 +622,21 @@ int snd_es1688_create(struct snd_card *card,
if (chip == NULL) if (chip == NULL)
return -ENOMEM; return -ENOMEM;
chip->card = card;
chip->irq = -1; chip->irq = -1;
chip->dma8 = -1; chip->dma8 = -1;
chip->hardware = ES1688_HW_UNDEF; chip->hardware = ES1688_HW_UNDEF;
chip->res_port = request_region(port + 4, 12, "ES1688"); chip->res_port = request_region(port + 4, 12, "ES1688");
if (chip->res_port == NULL) { 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; err = -EBUSY;
goto exit; goto exit;
} }
err = request_irq(irq, snd_es1688_interrupt, 0, "ES1688", (void *) chip); err = request_irq(irq, snd_es1688_interrupt, 0, "ES1688", (void *) chip);
if (err < 0) { 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; goto exit;
} }
...@@ -642,7 +645,7 @@ int snd_es1688_create(struct snd_card *card, ...@@ -642,7 +645,7 @@ int snd_es1688_create(struct snd_card *card,
err = request_dma(dma8, "ES1688"); err = request_dma(dma8, "ES1688");
if (err < 0) { 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; goto exit;
} }
chip->dma8 = dma8; chip->dma8 = dma8;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7