Skip to content

Commit

Permalink
ASoC: wm9712: Cleanup printk usage
Browse files Browse the repository at this point in the history
Use dev_err() instead of printk(KERN_ERR. This is common practice and makes
it easy to find out which device generated the message. While we are at it
also align the error messages with the other AC'97 drivers.

Also avoid printing two error messages when the reset fails.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Oct 31, 2014
1 parent f114040 commit 12ced33
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions sound/soc/codecs/wm9712.c
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ static int wm9712_reset(struct snd_soc_codec *codec, int try_warm)
return 0;

err:
printk(KERN_ERR "WM9712 AC97 reset failed\n");
dev_err(codec->dev, "Failed to reset: AC97 link error\n");
return -EIO;
}

Expand All @@ -611,10 +611,8 @@ static int wm9712_soc_resume(struct snd_soc_codec *codec)
u16 *cache = codec->reg_cache;

ret = wm9712_reset(codec, 1);
if (ret < 0) {
printk(KERN_ERR "could not reset AC97 codec\n");
if (ret < 0)
return ret;
}

wm9712_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

Expand All @@ -637,15 +635,13 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec)

ret = snd_soc_new_ac97_codec(codec, soc_ac97_ops, 0);
if (ret < 0) {
printk(KERN_ERR "wm9712: failed to register AC97 codec\n");
dev_err(codec->dev, "Failed to register AC97 codec\n");
return ret;
}

ret = wm9712_reset(codec, 0);
if (ret < 0) {
printk(KERN_ERR "Failed to reset WM9712: AC97 link error\n");
if (ret < 0)
goto reset_err;
}

/* set alc mux to none */
ac97_write(codec, AC97_VIDEO, ac97_read(codec, AC97_VIDEO) | 0x3000);
Expand Down

0 comments on commit 12ced33

Please sign in to comment.