Commit d41abde8 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarJaroslav Kysela <perex@perex.cz>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20240807133452.9424-52-tiwai@suse.de
parent 7e88541f

sound/sparc/amd7930.c

+4 −4
Original line number Diff line number Diff line
@@ -935,7 +935,7 @@ 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

		dev_err(card->dev,

			"amd7930-%d: Unable to map chip registers.\n", dev);

		kfree(amd);

		return -EIO;
@@ -945,7 +945,7 @@ 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_err(card->dev, "amd7930-%d: Unable to grab IRQ %d\n",

			dev, irq);

		snd_amd7930_free(amd);

		return -EBUSY;

sound/sparc/cs4231.c

+45 −33
Original line number Diff line number Diff line
@@ -292,8 +292,8 @@ 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",

		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));
@@ -325,7 +325,8 @@ 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",

		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));
@@ -363,13 +364,14 @@ 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",

		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),
@@ -386,7 +388,8 @@ 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",

		dev_dbg(chip->card->dev,

			"mce_down [%p] - auto calibration time out (0)\n",

			CS4231U(chip, REGSEL));

#endif

	chip->mce_bit &= ~CS4231_MCE;
@@ -394,8 +397,9 @@ static void snd_cs4231_mce_down(struct snd_cs4231 *chip) 
	__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,7 +419,7 @@ static void snd_cs4231_mce_down(struct snd_cs4231 *chip) 
	spin_unlock_irqrestore(&chip->lock, flags);



	if (reg)

		snd_printk(KERN_ERR

		dev_err(chip->card->dev,

			"mce_down - auto calibration time out (2)\n");

}
@@ -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,7 +740,7 @@ 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",

	pr_debug("init: (3) - afei = 0x%x\n",

		 chip->image[CS4231_ALT_FEATURE_1]);

#endif
@@ -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,7 +1821,8 @@ 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_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_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_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_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;

	}