aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/soc/codecs/es8328.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-09-06 14:29:32 +0200
committerMark Brown <broonie@kernel.org>2014-09-06 13:38:30 +0100
commit8d01370f59856a0ac5b222878667d52477b589f0 (patch)
treeec9f0bf2bf32a88ed3d2302df5cb60dbff6fa6c6 /sound/soc/codecs/es8328.c
parentMerge branch 'topic/suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-es8328 (diff)
downloadwireguard-linux-8d01370f59856a0ac5b222878667d52477b589f0.tar.xz
wireguard-linux-8d01370f59856a0ac5b222878667d52477b589f0.zip
ASoC: es8328: 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>
Diffstat (limited to 'sound/soc/codecs/es8328.c')
-rw-r--r--sound/soc/codecs/es8328.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/es8328.c b/sound/soc/codecs/es8328.c
index 3ff787063304..f27325155ace 100644
--- a/sound/soc/codecs/es8328.c
+++ b/sound/soc/codecs/es8328.c
@@ -602,8 +602,6 @@ static int es8328_suspend(struct snd_soc_codec *codec)
es8328 = snd_soc_codec_get_drvdata(codec);
- es8328_set_bias_level(codec, SND_SOC_BIAS_OFF);
-
clk_disable_unprepare(es8328->clk);
ret = regulator_bulk_disable(ARRAY_SIZE(es8328->supplies),
@@ -643,7 +641,6 @@ static int es8328_resume(struct snd_soc_codec *codec)
return ret;
}
- es8328_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0;
}
@@ -712,6 +709,8 @@ static struct snd_soc_codec_driver es8328_codec_driver = {
.resume = es8328_resume,
.remove = es8328_remove,
.set_bias_level = es8328_set_bias_level,
+ .suspend_bias_off = true,
+
.controls = es8328_snd_controls,
.num_controls = ARRAY_SIZE(es8328_snd_controls),
.dapm_widgets = es8328_dapm_widgets,