diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-11-23 07:37:47 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-11-24 13:43:24 -0500 |
commit | ab492b86b89be6c98bdca71cfc97b411ca42e140 (patch) | |
tree | aafbceb3c9044108022332a0dfc3e11698911212 /sound | |
parent | 9a812c6b7a2092e20b4b78ed0ec6614a89e96dfd (diff) |
ASoC: wm9712: Cleanup manual bias level transitions
Set the CODEC driver's suspend_bias_off flag rather than manually going to
SND_SOC_BIAS_OFF in suspend. This makes the code a bit shorter and cleaner.
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')
-rw-r--r-- | sound/soc/codecs/wm9712.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index f3aab6e1d92a..30f4b1773070 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c | |||
@@ -599,12 +599,6 @@ err: | |||
599 | return -EIO; | 599 | return -EIO; |
600 | } | 600 | } |
601 | 601 | ||
602 | static int wm9712_soc_suspend(struct snd_soc_codec *codec) | ||
603 | { | ||
604 | wm9712_set_bias_level(codec, SND_SOC_BIAS_OFF); | ||
605 | return 0; | ||
606 | } | ||
607 | |||
608 | static int wm9712_soc_resume(struct snd_soc_codec *codec) | 602 | static int wm9712_soc_resume(struct snd_soc_codec *codec) |
609 | { | 603 | { |
610 | int i, ret; | 604 | int i, ret; |
@@ -646,8 +640,6 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec) | |||
646 | /* set alc mux to none */ | 640 | /* set alc mux to none */ |
647 | ac97_write(codec, AC97_VIDEO, ac97_read(codec, AC97_VIDEO) | 0x3000); | 641 | ac97_write(codec, AC97_VIDEO, ac97_read(codec, AC97_VIDEO) | 0x3000); |
648 | 642 | ||
649 | wm9712_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
650 | |||
651 | return 0; | 643 | return 0; |
652 | 644 | ||
653 | reset_err: | 645 | reset_err: |
@@ -664,11 +656,11 @@ static int wm9712_soc_remove(struct snd_soc_codec *codec) | |||
664 | static struct snd_soc_codec_driver soc_codec_dev_wm9712 = { | 656 | static struct snd_soc_codec_driver soc_codec_dev_wm9712 = { |
665 | .probe = wm9712_soc_probe, | 657 | .probe = wm9712_soc_probe, |
666 | .remove = wm9712_soc_remove, | 658 | .remove = wm9712_soc_remove, |
667 | .suspend = wm9712_soc_suspend, | ||
668 | .resume = wm9712_soc_resume, | 659 | .resume = wm9712_soc_resume, |
669 | .read = ac97_read, | 660 | .read = ac97_read, |
670 | .write = ac97_write, | 661 | .write = ac97_write, |
671 | .set_bias_level = wm9712_set_bias_level, | 662 | .set_bias_level = wm9712_set_bias_level, |
663 | .suspend_bias_off = true, | ||
672 | .reg_cache_size = ARRAY_SIZE(wm9712_reg), | 664 | .reg_cache_size = ARRAY_SIZE(wm9712_reg), |
673 | .reg_word_size = sizeof(u16), | 665 | .reg_word_size = sizeof(u16), |
674 | .reg_cache_step = 2, | 666 | .reg_cache_step = 2, |