Skip to content

Commit

Permalink
ASoC: wm8995: Cleanup manual bias level transitions
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Nov 24, 2014
1 parent b131c02 commit aee9ffa
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions sound/soc/codecs/wm8995.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit aee9ffa

Please sign in to comment.