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

ASoC: wm8990: 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>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Lars-Peter Clausen 2014-11-23 13:37:40 +01:00 committed by Mark Brown
parent 5d01410fe4
commit 955efc8f50
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sound/soc/codecs/wm8990.c
View file

@ -1271,18 +1271,6 @@ static struct snd_soc_dai_driver wm8990_dai = {
.ops = &wm8990_dai_ops, .ops = &wm8990_dai_ops,
}; };
static int wm8990_suspend(struct snd_soc_codec *codec)
{
wm8990_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
static int wm8990_resume(struct snd_soc_codec *codec)
{
wm8990_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0;
}
/* /*
* initialise the WM8990 driver * initialise the WM8990 driver
* register the mixer and dsp interfaces with the kernel * register the mixer and dsp interfaces with the kernel
@ -1309,19 +1297,11 @@ static int wm8990_probe(struct snd_soc_codec *codec)
return 0; return 0;
} }
/* power down chip */
static int wm8990_remove(struct snd_soc_codec *codec)
{
wm8990_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
static struct snd_soc_codec_driver soc_codec_dev_wm8990 = { static struct snd_soc_codec_driver soc_codec_dev_wm8990 = {
.probe = wm8990_probe, .probe = wm8990_probe,
.remove = wm8990_remove,
.suspend = wm8990_suspend,
.resume = wm8990_resume,
.set_bias_level = wm8990_set_bias_level, .set_bias_level = wm8990_set_bias_level,
.suspend_bias_off = true,
.controls = wm8990_snd_controls, .controls = wm8990_snd_controls,
.num_controls = ARRAY_SIZE(wm8990_snd_controls), .num_controls = ARRAY_SIZE(wm8990_snd_controls),
.dapm_widgets = wm8990_dapm_widgets, .dapm_widgets = wm8990_dapm_widgets,