ASoC: wm8750: 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>

1 files changed, 1 insertions, 24 deletions

diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index d9e262657887..eb0a1644ba11 100644
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -686,18 +686,6 @@ static struct snd_soc_dai_driver wm8750_dai = {
         .ops = &wm8750_dai_ops,
 };
 
-static int wm8750_suspend(struct snd_soc_codec *codec)
-{
-        wm8750_set_bias_level(codec, SND_SOC_BIAS_OFF);
-        return 0;
-}
-
-static int wm8750_resume(struct snd_soc_codec *codec)
-{
-        wm8750_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-        return 0;
-}
-
 static int wm8750_probe(struct snd_soc_codec *codec)
 {
         int ret;
@@ -708,9 +696,6 @@ static int wm8750_probe(struct snd_soc_codec *codec)
                 return ret;
         }
 
-        /* charge output caps */
-        wm8750_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
         /* set the update bits */
         snd_soc_update_bits(codec, WM8750_LDAC, 0x0100, 0x0100);
         snd_soc_update_bits(codec, WM8750_RDAC, 0x0100, 0x0100);
@@ -724,18 +709,10 @@ static int wm8750_probe(struct snd_soc_codec *codec)
         return ret;
 }
 
-static int wm8750_remove(struct snd_soc_codec *codec)
-{
-        wm8750_set_bias_level(codec, SND_SOC_BIAS_OFF);
-        return 0;
-}
-
 static struct snd_soc_codec_driver soc_codec_dev_wm8750 = {
         .probe =        wm8750_probe,
-        .remove =       wm8750_remove,
-        .suspend =      wm8750_suspend,
-        .resume =       wm8750_resume,
         .set_bias_level = wm8750_set_bias_level,
+        .suspend_bias_off = true,
 
         .controls = wm8750_snd_controls,
         .num_controls = ARRAY_SIZE(wm8750_snd_controls),