diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-11-23 13:37:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-24 18:41:05 +0000 |
| commit | aee9ffabec81d96d68d8537ccc6fedfbb0e6c468 (patch) | |
| tree | b78025f031cf618df85d86a1090bf6114edd1d3e /sound/soc/codecs/wm8995.c | |
| parent | b131c02e99b9da672a2b0cf96bad48d74c39572e (diff) | |
| download | blackbird-op-linux-aee9ffabec81d96d68d8537ccc6fedfbb0e6c468.tar.gz blackbird-op-linux-aee9ffabec81d96d68d8537ccc6fedfbb0e6c468.zip | |
ASoC: wm8995: 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>
Diffstat (limited to 'sound/soc/codecs/wm8995.c')
| -rw-r--r-- | sound/soc/codecs/wm8995.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c index e40c8a662183..c280f0a3a424 100644 --- a/sound/soc/codecs/wm8995.c +++ b/sound/soc/codecs/wm8995.c @@ -2004,7 +2004,6 @@ static int wm8995_remove(struct snd_soc_codec *codec) int i; wm8995 = snd_soc_codec_get_drvdata(codec); - wm8995_set_bias_level(codec, SND_SOC_BIAS_OFF); for (i = 0; i < ARRAY_SIZE(wm8995->supplies); ++i) regulator_unregister_notifier(wm8995->supplies[i].consumer, @@ -2078,8 +2077,6 @@ static int wm8995_probe(struct snd_soc_codec *codec) goto err_reg_enable; } - wm8995_set_bias_level(codec, SND_SOC_BIAS_STANDBY); - /* Latch volume updates (right only; we always do left then right). */ snd_soc_update_bits(codec, WM8995_AIF1_DAC1_RIGHT_VOLUME, WM8995_AIF1DAC1_VU_MASK, WM8995_AIF1DAC1_VU); |
