ASoC: wm9090: 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 and SND_SOC_BIAS_STANDBY in resume. This makes
the code a bit shorter and cleaner.

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>

diff --git a/sound/soc/codecs/wm9090.c b/sound/soc/codecs/wm9090.c
index a13f0725611a9be6284678069ca9bafe9a98e66f..6ffe8dc4f3fad5ba5a08544bda7e062fecef3f79 100644 (file)
--- a/sound/soc/codecs/wm9090.c
+++ b/sound/soc/codecs/wm9090.c
@@ -550,45 +550,15 @@ static int wm9090_probe(struct snd_soc_codec *codec)
        snd_soc_update_bits(codec, WM9090_CLOCKING_1,
                            WM9090_TOCLK_ENA, WM9090_TOCLK_ENA);
 
-       wm9090_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
        wm9090_add_controls(codec);
 
        return 0;
 }
 
-#ifdef CONFIG_PM
-static int wm9090_suspend(struct snd_soc_codec *codec)
-{
-       wm9090_set_bias_level(codec, SND_SOC_BIAS_OFF);
-
-       return 0;
-}
-
-static int wm9090_resume(struct snd_soc_codec *codec)
-{
-       wm9090_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
-       return 0;
-}
-#else
-#define wm9090_suspend NULL
-#define wm9090_resume NULL
-#endif
-
-static int wm9090_remove(struct snd_soc_codec *codec)
-{
-       wm9090_set_bias_level(codec, SND_SOC_BIAS_OFF);
-
-       return 0;
-}
-
 static struct snd_soc_codec_driver soc_codec_dev_wm9090 = {
        .probe =        wm9090_probe,
-       .remove =       wm9090_remove,
-       .suspend =      wm9090_suspend,
-       .resume =       wm9090_resume,
        .set_bias_level = wm9090_set_bias_level,
+       .suspend_bias_off = true,
 };
 
 static const struct regmap_config wm9090_regmap = {