aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-09-06 08:29:32 -0400
committerMark Brown <broonie@kernel.org>2014-09-06 08:38:30 -0400
commit8d01370f59856a0ac5b222878667d52477b589f0 (patch)
treeec9f0bf2bf32a88ed3d2302df5cb60dbff6fa6c6
parentbade5f09ca5bfd5a5f499a682509a9109472bca8 (diff)
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>
-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)
602 602
603 es8328 = snd_soc_codec_get_drvdata(codec); 603 es8328 = snd_soc_codec_get_drvdata(codec);
604 604
605 es8328_set_bias_level(codec, SND_SOC_BIAS_OFF);
606
607 clk_disable_unprepare(es8328->clk); 605 clk_disable_unprepare(es8328->clk);
608 606
609 ret = regulator_bulk_disable(ARRAY_SIZE(es8328->supplies), 607 ret = regulator_bulk_disable(ARRAY_SIZE(es8328->supplies),
@@ -643,7 +641,6 @@ static int es8328_resume(struct snd_soc_codec *codec)
643 return ret; 641 return ret;
644 } 642 }
645 643
646 es8328_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
647 return 0; 644 return 0;
648} 645}
649 646
@@ -712,6 +709,8 @@ static struct snd_soc_codec_driver es8328_codec_driver = {
712 .resume = es8328_resume, 709 .resume = es8328_resume,
713 .remove = es8328_remove, 710 .remove = es8328_remove,
714 .set_bias_level = es8328_set_bias_level, 711 .set_bias_level = es8328_set_bias_level,
712 .suspend_bias_off = true,
713
715 .controls = es8328_snd_controls, 714 .controls = es8328_snd_controls,
716 .num_controls = ARRAY_SIZE(es8328_snd_controls), 715 .num_controls = ARRAY_SIZE(es8328_snd_controls),
717 .dapm_widgets = es8328_dapm_widgets, 716 .dapm_widgets = es8328_dapm_widgets,