ASoC: rt5631: Cleanup 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.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c
index 9425545e84032308937094f16633bb3f61b59ccf..6d7b7ca7d530f034d2e972ba8070c03280e22bd0 100644 (file)
--- a/sound/soc/codecs/rt5631.c
+++ b/sound/soc/codecs/rt5631.c
@@ -1612,29 +1612,6 @@ static int rt5631_probe(struct snd_soc_codec *codec)
        return 0;
 }
 
-static int rt5631_remove(struct snd_soc_codec *codec)
-{
-       rt5631_set_bias_level(codec, SND_SOC_BIAS_OFF);
-       return 0;
-}
-
-#ifdef CONFIG_PM
-static int rt5631_suspend(struct snd_soc_codec *codec)
-{
-       rt5631_set_bias_level(codec, SND_SOC_BIAS_OFF);
-       return 0;
-}
-
-static int rt5631_resume(struct snd_soc_codec *codec)
-{
-       rt5631_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-       return 0;
-}
-#else
-#define rt5631_suspend NULL
-#define rt5631_resume NULL
-#endif
-
 #define RT5631_STEREO_RATES SNDRV_PCM_RATE_8000_96000
 #define RT5631_FORMAT  (SNDRV_PCM_FMTBIT_S16_LE | \
                        SNDRV_PCM_FMTBIT_S20_3LE | \
@@ -1672,10 +1649,8 @@ static struct snd_soc_dai_driver rt5631_dai[] = {
 
 static struct snd_soc_codec_driver soc_codec_dev_rt5631 = {
        .probe = rt5631_probe,
-       .remove = rt5631_remove,
-       .suspend = rt5631_suspend,
-       .resume = rt5631_resume,
        .set_bias_level = rt5631_set_bias_level,
+       .suspend_bias_off = true,
        .controls = rt5631_snd_controls,
        .num_controls = ARRAY_SIZE(rt5631_snd_controls),
        .dapm_widgets = rt5631_dapm_widgets,