p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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.

The manual transition to SND_SOC_BIAS_STANDBY at the end of CODEC probe()
can also be removed as the core will automatically do this after the CODEC
has been probed.

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 2015-03-30 21:04:47 +02:00 committed by Mark Brown
parent 643518403c
commit c59e6abba9
1 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sound/soc/codecs/wm8971.c
View File

@ -629,18 +629,6 @@ static struct snd_soc_dai_driver wm8971_dai = {
.ops = &wm8971_dai_ops, .ops = &wm8971_dai_ops,
}; };
static int wm8971_suspend(struct snd_soc_codec *codec)
{
wm8971_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
static int wm8971_resume(struct snd_soc_codec *codec)
{
wm8971_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0;
}
static int wm8971_probe(struct snd_soc_codec *codec) static int wm8971_probe(struct snd_soc_codec *codec)
{ {
struct wm8971_priv *wm8971 = snd_soc_codec_get_drvdata(codec); struct wm8971_priv *wm8971 = snd_soc_codec_get_drvdata(codec);
@ -649,8 +637,6 @@ static int wm8971_probe(struct snd_soc_codec *codec)
wm8971_reset(codec); wm8971_reset(codec);
wm8971_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
/* set the update bits */ /* set the update bits */
snd_soc_update_bits(codec, WM8971_LDAC, 0x0100, 0x0100); snd_soc_update_bits(codec, WM8971_LDAC, 0x0100, 0x0100);
snd_soc_update_bits(codec, WM8971_RDAC, 0x0100, 0x0100); snd_soc_update_bits(codec, WM8971_RDAC, 0x0100, 0x0100);
@ -664,21 +650,10 @@ static int wm8971_probe(struct snd_soc_codec *codec)
return 0; return 0;
} }
/* power down chip */
static int wm8971_remove(struct snd_soc_codec *codec)
{
wm8971_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
static struct snd_soc_codec_driver soc_codec_dev_wm8971 = { static struct snd_soc_codec_driver soc_codec_dev_wm8971 = {
.probe = wm8971_probe, .probe = wm8971_probe,
.remove = wm8971_remove,
.suspend = wm8971_suspend,
.resume = wm8971_resume,
.set_bias_level = wm8971_set_bias_level, .set_bias_level = wm8971_set_bias_level,
.suspend_bias_off = true,
.controls = wm8971_snd_controls, .controls = wm8971_snd_controls,
.num_controls = ARRAY_SIZE(wm8971_snd_controls), .num_controls = ARRAY_SIZE(wm8971_snd_controls),