Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ASoC: sta350: Cleanup manual bias level transitions

Browse source 
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>
This commit is contained in:
Lars-Peter Clausen 2014-10-20 10:56:37 +02:00 committed by Mark Brown
parent f114040e3e
commit 2062c1ff35
1 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sound/soc/codecs/sta350.c
View file

@ -912,23 +912,6 @@ static struct snd_soc_dai_driver sta350_dai = {
.ops = &sta350_dai_ops, .ops = &sta350_dai_ops,
}; };
#ifdef CONFIG_PM
static int sta350_suspend(struct snd_soc_codec *codec)
{
sta350_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
static int sta350_resume(struct snd_soc_codec *codec)
{
sta350_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0;
}
#else
#define sta350_suspend NULL
#define sta350_resume NULL
#endif
static int sta350_probe(struct snd_soc_codec *codec) static int sta350_probe(struct snd_soc_codec *codec)
{ {
struct sta350_priv *sta350 = snd_soc_codec_get_drvdata(codec); struct sta350_priv *sta350 = snd_soc_codec_get_drvdata(codec);
@ -1065,7 +1048,6 @@ static int sta350_remove(struct snd_soc_codec *codec)
{ {
struct sta350_priv *sta350 = snd_soc_codec_get_drvdata(codec); struct sta350_priv *sta350 = snd_soc_codec_get_drvdata(codec);
sta350_set_bias_level(codec, SND_SOC_BIAS_OFF);
regulator_bulk_disable(ARRAY_SIZE(sta350->supplies), sta350->supplies); regulator_bulk_disable(ARRAY_SIZE(sta350->supplies), sta350->supplies);
return 0; return 0;
@ -1074,9 +1056,8 @@ static int sta350_remove(struct snd_soc_codec *codec)
static const struct snd_soc_codec_driver sta350_codec = { static const struct snd_soc_codec_driver sta350_codec = {
.probe = sta350_probe, .probe = sta350_probe,
.remove = sta350_remove, .remove = sta350_remove,
.suspend = sta350_suspend,
.resume = sta350_resume,
.set_bias_level = sta350_set_bias_level, .set_bias_level = sta350_set_bias_level,
.suspend_bias_off = true,
.controls = sta350_snd_controls, .controls = sta350_snd_controls,
.num_controls = ARRAY_SIZE(sta350_snd_controls), .num_controls = ARRAY_SIZE(sta350_snd_controls),
.dapm_widgets = sta350_dapm_widgets, .dapm_widgets = sta350_dapm_widgets,