提交 ab492b86 编写于 作者: L Lars-Peter Clausen 提交者: Mark Brown

ASoC: wm9712: Cleanup manual bias level transitions

Set the CODEC driver's suspend_bias_off flag rather than manually going to
SND_SOC_BIAS_OFF in suspend. This makes the code a bit shorter and cleaner.

The manual transition to SND_SOC_BIAS_STANDBY at the end of CODEC probe()
can also be removed as the core will automatically do this after the CODEC
has been probed.
Signed-off-by: NLars-Peter Clausen <lars@metafoo.de>
Acked-by: NCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: NMark Brown <broonie@kernel.org>
上级 9a812c6b
...@@ -599,12 +599,6 @@ static int wm9712_reset(struct snd_soc_codec *codec, int try_warm) ...@@ -599,12 +599,6 @@ static int wm9712_reset(struct snd_soc_codec *codec, int try_warm)
return -EIO; return -EIO;
} }
static int wm9712_soc_suspend(struct snd_soc_codec *codec)
{
wm9712_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
static int wm9712_soc_resume(struct snd_soc_codec *codec) static int wm9712_soc_resume(struct snd_soc_codec *codec)
{ {
int i, ret; int i, ret;
...@@ -646,8 +640,6 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec) ...@@ -646,8 +640,6 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec)
/* set alc mux to none */ /* set alc mux to none */
ac97_write(codec, AC97_VIDEO, ac97_read(codec, AC97_VIDEO) | 0x3000); ac97_write(codec, AC97_VIDEO, ac97_read(codec, AC97_VIDEO) | 0x3000);
wm9712_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0; return 0;
reset_err: reset_err:
...@@ -664,11 +656,11 @@ static int wm9712_soc_remove(struct snd_soc_codec *codec) ...@@ -664,11 +656,11 @@ static int wm9712_soc_remove(struct snd_soc_codec *codec)
static struct snd_soc_codec_driver soc_codec_dev_wm9712 = { static struct snd_soc_codec_driver soc_codec_dev_wm9712 = {
.probe = wm9712_soc_probe, .probe = wm9712_soc_probe,
.remove = wm9712_soc_remove, .remove = wm9712_soc_remove,
.suspend = wm9712_soc_suspend,
.resume = wm9712_soc_resume, .resume = wm9712_soc_resume,
.read = ac97_read, .read = ac97_read,
.write = ac97_write, .write = ac97_write,
.set_bias_level = wm9712_set_bias_level, .set_bias_level = wm9712_set_bias_level,
.suspend_bias_off = true,
.reg_cache_size = ARRAY_SIZE(wm9712_reg), .reg_cache_size = ARRAY_SIZE(wm9712_reg),
.reg_word_size = sizeof(u16), .reg_word_size = sizeof(u16),
.reg_cache_step = 2, .reg_cache_step = 2,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册