On Fri, Sep 24, 2010 at 3:41 AM, Mark Brown
<broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> wrote:
> Could use dev_() but we'd have to remember the struct device somewhere
> and it wouldn't make the logging clearer.
>
> Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
> ---
> Âsound/soc/s3c24xx/s3c-ac97.c | Â 11 ++++++-----
> Â1 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/sound/soc/s3c24xx/s3c-ac97.c b/sound/soc/s3c24xx/s3c-ac97.c
> index 26f4ed9..31e2b3d 100644
> --- a/sound/soc/s3c24xx/s3c-ac97.c
> +++ b/sound/soc/s3c24xx/s3c-ac97.c
> @@ -89,7 +89,7 @@ static void s3c_ac97_activate(struct snd_ac97 *ac97)
> Â Â Â Âwritel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
>
> Â Â Â Âif (!wait_for_completion_timeout(&s3c_ac97.done, HZ))
> - Â Â Â Â Â Â Â printk(KERN_ERR "AC97: Unable to activate!");
> + Â Â Â Â Â Â Â pr_err("AC97: Unable to activate!");
> Â}
>
> Âstatic unsigned short s3c_ac97_read(struct snd_ac97 *ac97,
> @@ -115,14 +115,15 @@ static unsigned short s3c_ac97_read(struct snd_ac97 *ac97,
> Â Â Â Âwritel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
>
> Â Â Â Âif (!wait_for_completion_timeout(&s3c_ac97.done, HZ))
> - Â Â Â Â Â Â Â printk(KERN_ERR "AC97: Unable to read!");
> + Â Â Â Â Â Â Â pr_err("AC97: Unable to read!");
>
> Â Â Â Âstat = readl(s3c_ac97.regs + S3C_AC97_STAT);
> Â Â Â Âaddr = (stat >> 16) & 0x7f;
> Â Â Â Âdata = (stat & 0xffff);
>
> Â Â Â Âif (addr != reg)
> - Â Â Â Â Â Â Â printk(KERN_ERR "s3c-ac97: req addr = %02x, rep addr = %02x\n", reg, addr);
> + Â Â Â Â Â Â Â pr_err("s3c-ac97: req addr = %02x, rep addr = %02x\n",
> + Â Â Â Â Â Â Â Â Â Â Â reg, addr);
>
> Â Â Â Âmutex_unlock(&s3c_ac97.lock);
>
> @@ -151,7 +152,7 @@ static void s3c_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
> Â Â Â Âwritel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
>
> Â Â Â Âif (!wait_for_completion_timeout(&s3c_ac97.done, HZ))
> - Â Â Â Â Â Â Â printk(KERN_ERR "AC97: Unable to write!");
> + Â Â Â Â Â Â Â pr_err("AC97: Unable to write!");
>
> Â Â Â Âac_codec_cmd = readl(s3c_ac97.regs + S3C_AC97_CODEC_CMD);
> Â Â Â Âac_codec_cmd |= S3C_AC97_CODEC_CMD_READ;
> @@ -442,7 +443,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev)
> Â Â Â Âret = request_irq(irq_res->start, s3c_ac97_irq,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ÂIRQF_DISABLED, "AC97", NULL);
> Â Â Â Âif (ret < 0) {
> - Â Â Â Â Â Â Â printk(KERN_ERR "s3c-ac97: interrupt request failed.\n");
> + Â Â Â Â Â Â Â dev_err(&pdev->dev, "s3c-ac97: interrupt request failed.\n");
> Â Â Â Â Â Â Â Âgoto err4;
> Â Â Â Â}
Acked-by: Jassi Brar <jassi.brar@xxxxxxxxxxx>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
