diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-11-23 07:37:21 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-11-24 13:19:13 -0500 |
commit | 4d0a4c3c6dd2359c3d5facac7a306d513d79bff2 (patch) | |
tree | 2302b258431fb4d6d118dad8e6711c4512d6e246 | |
parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) |
ASoC: wm8580: 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/wm8580.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c index 911605ee25b0..0a887c5ec83a 100644 --- a/sound/soc/codecs/wm8580.c +++ b/sound/soc/codecs/wm8580.c | |||
@@ -882,8 +882,6 @@ static int wm8580_probe(struct snd_soc_codec *codec) | |||
882 | goto err_regulator_enable; | 882 | goto err_regulator_enable; |
883 | } | 883 | } |
884 | 884 | ||
885 | wm8580_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
886 | |||
887 | return 0; | 885 | return 0; |
888 | 886 | ||
889 | err_regulator_enable: | 887 | err_regulator_enable: |
@@ -897,8 +895,6 @@ static int wm8580_remove(struct snd_soc_codec *codec) | |||
897 | { | 895 | { |
898 | struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec); | 896 | struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec); |
899 | 897 | ||
900 | wm8580_set_bias_level(codec, SND_SOC_BIAS_OFF); | ||
901 | |||
902 | regulator_bulk_disable(ARRAY_SIZE(wm8580->supplies), wm8580->supplies); | 898 | regulator_bulk_disable(ARRAY_SIZE(wm8580->supplies), wm8580->supplies); |
903 | 899 | ||
904 | return 0; | 900 | return 0; |