diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-11-23 07:37:36 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-11-24 13:36:11 -0500 |
commit | d02486fd42a3295edbec4db8f7f81c1432fa60a4 (patch) | |
tree | 82fe0e2746008109228814cb5a65aab431d693d4 | |
parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) |
ASoC: wm8978: Cleanup manual bias level transitions
Since the ASoC core now takes care of setting the bias level to
SND_SOC_BIAS_OFF when removing the CODEC there is no need to do it manually
anymore either.
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: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/codecs/wm8978.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index ee2ba574952b..cf7032911721 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c | |||
@@ -991,21 +991,11 @@ static int wm8978_probe(struct snd_soc_codec *codec) | |||
991 | for (i = 0; i < ARRAY_SIZE(update_reg); i++) | 991 | for (i = 0; i < ARRAY_SIZE(update_reg); i++) |
992 | snd_soc_update_bits(codec, update_reg[i], 0x100, 0x100); | 992 | snd_soc_update_bits(codec, update_reg[i], 0x100, 0x100); |
993 | 993 | ||
994 | wm8978_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
995 | |||
996 | return 0; | ||
997 | } | ||
998 | |||
999 | /* power down chip */ | ||
1000 | static int wm8978_remove(struct snd_soc_codec *codec) | ||
1001 | { | ||
1002 | wm8978_set_bias_level(codec, SND_SOC_BIAS_OFF); | ||
1003 | return 0; | 994 | return 0; |
1004 | } | 995 | } |
1005 | 996 | ||
1006 | static struct snd_soc_codec_driver soc_codec_dev_wm8978 = { | 997 | static struct snd_soc_codec_driver soc_codec_dev_wm8978 = { |
1007 | .probe = wm8978_probe, | 998 | .probe = wm8978_probe, |
1008 | .remove = wm8978_remove, | ||
1009 | .suspend = wm8978_suspend, | 999 | .suspend = wm8978_suspend, |
1010 | .resume = wm8978_resume, | 1000 | .resume = wm8978_resume, |
1011 | .set_bias_level = wm8978_set_bias_level, | 1001 | .set_bias_level = wm8978_set_bias_level, |