ASoC: adau17x1: 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.

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

diff --git a/sound/soc/codecs/adau1761.c b/sound/soc/codecs/adau1761.c
index 848cab83955392b33f93c18dac3631f1f9fb0a97..5518ebd6947c5f28329fb474b4b313920f5e94ec 100644 (file)
--- a/sound/soc/codecs/adau1761.c
+++ b/sound/soc/codecs/adau1761.c
@@ -714,9 +714,9 @@ static int adau1761_codec_probe(struct snd_soc_codec *codec)
 
 static const struct snd_soc_codec_driver adau1761_codec_driver = {
        .probe = adau1761_codec_probe,
-       .suspend = adau17x1_suspend,
        .resume = adau17x1_resume,
        .set_bias_level = adau1761_set_bias_level,
+       .suspend_bias_off = true,
 
        .controls = adau1761_controls,
        .num_controls = ARRAY_SIZE(adau1761_controls),

diff --git a/sound/soc/codecs/adau1781.c b/sound/soc/codecs/adau1781.c
index 045a61413840f013b79aa0bcec624b1b8b75d6f5..e9fc00fb13ddf65597513fe58652183776b71d99 100644 (file)
--- a/sound/soc/codecs/adau1781.c
+++ b/sound/soc/codecs/adau1781.c
@@ -446,9 +446,9 @@ static int adau1781_codec_probe(struct snd_soc_codec *codec)
 
 static const struct snd_soc_codec_driver adau1781_codec_driver = {
        .probe = adau1781_codec_probe,
-       .suspend = adau17x1_suspend,
        .resume = adau17x1_resume,
        .set_bias_level = adau1781_set_bias_level,
+       .suspend_bias_off = true,
 
        .controls = adau1781_controls,
        .num_controls = ARRAY_SIZE(adau1781_controls),

diff --git a/sound/soc/codecs/adau17x1.c b/sound/soc/codecs/adau17x1.c
index 0b659704e60c0db2c425474857a5372e0702a22a..3e16c1c641156d428e1759956191f418a1edcd03 100644 (file)
--- a/sound/soc/codecs/adau17x1.c
+++ b/sound/soc/codecs/adau17x1.c
@@ -815,13 +815,6 @@ int adau17x1_add_routes(struct snd_soc_codec *codec)
 }
 EXPORT_SYMBOL_GPL(adau17x1_add_routes);
 
-int adau17x1_suspend(struct snd_soc_codec *codec)
-{
-       codec->driver->set_bias_level(codec, SND_SOC_BIAS_OFF);
-       return 0;
-}
-EXPORT_SYMBOL_GPL(adau17x1_suspend);
-
 int adau17x1_resume(struct snd_soc_codec *codec)
 {
        struct adau *adau = snd_soc_codec_get_drvdata(codec);
@@ -829,7 +822,6 @@ int adau17x1_resume(struct snd_soc_codec *codec)
        if (adau->switch_mode)
                adau->switch_mode(codec->dev);
 
-       codec->driver->set_bias_level(codec, SND_SOC_BIAS_STANDBY);
        regcache_sync(adau->regmap);
 
        return 0;

diff --git a/sound/soc/codecs/adau17x1.h b/sound/soc/codecs/adau17x1.h
index 3ffabaf4c7a846f7f9e46763981c3f92866cf0ec..e4a557fd7155c34b6c5c5da7a9f7337b2d14ecb7 100644 (file)
--- a/sound/soc/codecs/adau17x1.h
+++ b/sound/soc/codecs/adau17x1.h
@@ -52,7 +52,6 @@ int adau17x1_set_micbias_voltage(struct snd_soc_codec *codec,
        enum adau17x1_micbias_voltage micbias);
 bool adau17x1_readable_register(struct device *dev, unsigned int reg);
 bool adau17x1_volatile_register(struct device *dev, unsigned int reg);
-int adau17x1_suspend(struct snd_soc_codec *codec);
 int adau17x1_resume(struct snd_soc_codec *codec);
 
 extern const struct snd_soc_dai_ops adau17x1_dai_ops;