diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-09-02 16:20:33 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-03 14:26:26 -0400 |
commit | a7edeba4cbbd0f3d22d6d54da7c507bda29b2658 (patch) | |
tree | 751e8e07d9ebe81198f555514a17cef2ed948ef0 | |
parent | 7d1a99da0861330f02de5c0f59df1d338477cb54 (diff) |
ASoC: wm8804: Remove unnecessary suspend/resume bias level changes
The ASoC core will only call the suspend/resume callbacks when the device's
DAPM context is idle. Since this driver sets idle_bias_off to true this
means that the device is already in SND_SOC_BIAS_OFF when the suspend
callback is called, so there is no need to manually set this state again.
There is also no need to go to SND_SOC_BIAS_STANDBY in the resume callback
since the core will go right back to SND_SOC_BIAS_OFF.
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>
-rw-r--r-- | sound/soc/codecs/wm8804.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index 0ea01dfcb6e1..3addc5fe5cb2 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c | |||
@@ -518,23 +518,6 @@ static int wm8804_set_bias_level(struct snd_soc_codec *codec, | |||
518 | return 0; | 518 | return 0; |
519 | } | 519 | } |
520 | 520 | ||
521 | #ifdef CONFIG_PM | ||
522 | static int wm8804_suspend(struct snd_soc_codec *codec) | ||
523 | { | ||
524 | wm8804_set_bias_level(codec, SND_SOC_BIAS_OFF); | ||
525 | return 0; | ||
526 | } | ||
527 | |||
528 | static int wm8804_resume(struct snd_soc_codec *codec) | ||
529 | { | ||
530 | wm8804_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
531 | return 0; | ||
532 | } | ||
533 | #else | ||
534 | #define wm8804_suspend NULL | ||
535 | #define wm8804_resume NULL | ||
536 | #endif | ||
537 | |||
538 | static int wm8804_remove(struct snd_soc_codec *codec) | 521 | static int wm8804_remove(struct snd_soc_codec *codec) |
539 | { | 522 | { |
540 | struct wm8804_priv *wm8804; | 523 | struct wm8804_priv *wm8804; |
@@ -671,8 +654,6 @@ static struct snd_soc_dai_driver wm8804_dai = { | |||
671 | static struct snd_soc_codec_driver soc_codec_dev_wm8804 = { | 654 | static struct snd_soc_codec_driver soc_codec_dev_wm8804 = { |
672 | .probe = wm8804_probe, | 655 | .probe = wm8804_probe, |
673 | .remove = wm8804_remove, | 656 | .remove = wm8804_remove, |
674 | .suspend = wm8804_suspend, | ||
675 | .resume = wm8804_resume, | ||
676 | .set_bias_level = wm8804_set_bias_level, | 657 | .set_bias_level = wm8804_set_bias_level, |
677 | .idle_bias_off = true, | 658 | .idle_bias_off = true, |
678 | 659 | ||