diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-09-23 11:48:54 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-09-24 05:40:33 -0400 |
commit | 4a6f998ebb1e434ce83c6169a1afbe6a39015bea (patch) | |
tree | efbb213c17de0a317164af9ed876163fb59a326a /sound | |
parent | 97daff36f207c62df250092863f2af7e62b0e389 (diff) |
ASoC: Convert s3c-ac97 to pr_() macros
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@opensource.wolfsonmicro.com>
Acked-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound')
-rw-r--r-- | 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 26f4ed90a0ee..31e2b3d35a90 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) | |||
89 | writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL); | 89 | writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL); |
90 | 90 | ||
91 | if (!wait_for_completion_timeout(&s3c_ac97.done, HZ)) | 91 | if (!wait_for_completion_timeout(&s3c_ac97.done, HZ)) |
92 | printk(KERN_ERR "AC97: Unable to activate!"); | 92 | pr_err("AC97: Unable to activate!"); |
93 | } | 93 | } |
94 | 94 | ||
95 | static unsigned short s3c_ac97_read(struct snd_ac97 *ac97, | 95 | static unsigned short s3c_ac97_read(struct snd_ac97 *ac97, |
@@ -115,14 +115,15 @@ static unsigned short s3c_ac97_read(struct snd_ac97 *ac97, | |||
115 | writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL); | 115 | writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL); |
116 | 116 | ||
117 | if (!wait_for_completion_timeout(&s3c_ac97.done, HZ)) | 117 | if (!wait_for_completion_timeout(&s3c_ac97.done, HZ)) |
118 | printk(KERN_ERR "AC97: Unable to read!"); | 118 | pr_err("AC97: Unable to read!"); |
119 | 119 | ||
120 | stat = readl(s3c_ac97.regs + S3C_AC97_STAT); | 120 | stat = readl(s3c_ac97.regs + S3C_AC97_STAT); |
121 | addr = (stat >> 16) & 0x7f; | 121 | addr = (stat >> 16) & 0x7f; |
122 | data = (stat & 0xffff); | 122 | data = (stat & 0xffff); |
123 | 123 | ||
124 | if (addr != reg) | 124 | if (addr != reg) |
125 | printk(KERN_ERR "s3c-ac97: req addr = %02x, rep addr = %02x\n", reg, addr); | 125 | pr_err("s3c-ac97: req addr = %02x, rep addr = %02x\n", |
126 | reg, addr); | ||
126 | 127 | ||
127 | mutex_unlock(&s3c_ac97.lock); | 128 | mutex_unlock(&s3c_ac97.lock); |
128 | 129 | ||
@@ -151,7 +152,7 @@ static void s3c_ac97_write(struct snd_ac97 *ac97, unsigned short reg, | |||
151 | writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL); | 152 | writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL); |
152 | 153 | ||
153 | if (!wait_for_completion_timeout(&s3c_ac97.done, HZ)) | 154 | if (!wait_for_completion_timeout(&s3c_ac97.done, HZ)) |
154 | printk(KERN_ERR "AC97: Unable to write!"); | 155 | pr_err("AC97: Unable to write!"); |
155 | 156 | ||
156 | ac_codec_cmd = readl(s3c_ac97.regs + S3C_AC97_CODEC_CMD); | 157 | ac_codec_cmd = readl(s3c_ac97.regs + S3C_AC97_CODEC_CMD); |
157 | ac_codec_cmd |= S3C_AC97_CODEC_CMD_READ; | 158 | ac_codec_cmd |= S3C_AC97_CODEC_CMD_READ; |
@@ -442,7 +443,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev) | |||
442 | ret = request_irq(irq_res->start, s3c_ac97_irq, | 443 | ret = request_irq(irq_res->start, s3c_ac97_irq, |
443 | IRQF_DISABLED, "AC97", NULL); | 444 | IRQF_DISABLED, "AC97", NULL); |
444 | if (ret < 0) { | 445 | if (ret < 0) { |
445 | printk(KERN_ERR "s3c-ac97: interrupt request failed.\n"); | 446 | dev_err(&pdev->dev, "s3c-ac97: interrupt request failed.\n"); |
446 | goto err4; | 447 | goto err4; |
447 | } | 448 | } |
448 | 449 | ||