ASoC: wm8995: Cleanup manual bias level transitions
authorLars-Peter Clausen <lars@metafoo.de>
Sun, 23 Nov 2014 12:37:44 +0000 (13:37 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 24 Nov 2014 18:41:05 +0000 (18:41 +0000)
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>
sound/soc/codecs/wm8995.c

index e40c8a662183cf22381099643799cf251680b6bf..c280f0a3a424303ebba6def4972d4e644fc479f8 100644 (file)
@@ -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);