diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-11-23 07:37:28 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-11-24 13:25:26 -0500 |
commit | a4235a14bef979752fb2ddb4dafdb696f622beb0 (patch) | |
tree | a29593930bf23f9aa8cb716d8f7bfe6287134f61 /sound/soc/codecs/wm8804.c | |
parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) |
ASoC: wm8804: 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/wm8804.c')
-rw-r--r-- | sound/soc/codecs/wm8804.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index 3addc5fe5cb2..1315f7642503 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c | |||
@@ -524,7 +524,6 @@ static int wm8804_remove(struct snd_soc_codec *codec) | |||
524 | int i; | 524 | int i; |
525 | 525 | ||
526 | wm8804 = snd_soc_codec_get_drvdata(codec); | 526 | wm8804 = snd_soc_codec_get_drvdata(codec); |
527 | wm8804_set_bias_level(codec, SND_SOC_BIAS_OFF); | ||
528 | 527 | ||
529 | for (i = 0; i < ARRAY_SIZE(wm8804->supplies); ++i) | 528 | for (i = 0; i < ARRAY_SIZE(wm8804->supplies); ++i) |
530 | regulator_unregister_notifier(wm8804->supplies[i].consumer, | 529 | regulator_unregister_notifier(wm8804->supplies[i].consumer, |
@@ -606,8 +605,6 @@ static int wm8804_probe(struct snd_soc_codec *codec) | |||
606 | goto err_reg_enable; | 605 | goto err_reg_enable; |
607 | } | 606 | } |
608 | 607 | ||
609 | wm8804_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
610 | |||
611 | return 0; | 608 | return 0; |
612 | 609 | ||
613 | err_reg_enable: | 610 | err_reg_enable: |