ASoC: wm8995: Remove unnecessary suspend/resume bias level changes
authorLars-Peter Clausen <lars@metafoo.de>
Tue, 2 Sep 2014 20:20:34 +0000 (22:20 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 3 Sep 2014 18:26:26 +0000 (19:26 +0100)
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>
sound/soc/codecs/wm8995.c

index cae4ac5a573061614007f211ec523d96779e5b9d..1288edeb8c7dea9530620345028fc990ac55cb6c 100644 (file)
@@ -1998,23 +1998,6 @@ static int wm8995_set_bias_level(struct snd_soc_codec *codec,
        return 0;
 }
 
-#ifdef CONFIG_PM
-static int wm8995_suspend(struct snd_soc_codec *codec)
-{
-       wm8995_set_bias_level(codec, SND_SOC_BIAS_OFF);
-       return 0;
-}
-
-static int wm8995_resume(struct snd_soc_codec *codec)
-{
-       wm8995_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-       return 0;
-}
-#else
-#define wm8995_suspend NULL
-#define wm8995_resume NULL
-#endif
-
 static int wm8995_remove(struct snd_soc_codec *codec)
 {
        struct wm8995_priv *wm8995;
@@ -2220,8 +2203,6 @@ static struct snd_soc_dai_driver wm8995_dai[] = {
 static struct snd_soc_codec_driver soc_codec_dev_wm8995 = {
        .probe = wm8995_probe,
        .remove = wm8995_remove,
-       .suspend = wm8995_suspend,
-       .resume = wm8995_resume,
        .set_bias_level = wm8995_set_bias_level,
        .idle_bias_off = true,
 };