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

ASoC: wm8961: 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 2014-11-23 13:37:34 +01:00 committed by Mark Brown
parent c4f50dbc56
commit 7bea32c5b2
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sound/soc/codecs/wm8961.c
View File

@ -870,44 +870,26 @@ static int wm8961_probe(struct snd_soc_codec *codec)
reg &= ~WM8961_MANUAL_MODE; reg &= ~WM8961_MANUAL_MODE;
snd_soc_write(codec, WM8961_CLOCKING_3, reg); snd_soc_write(codec, WM8961_CLOCKING_3, reg);
wm8961_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0;
}
static int wm8961_remove(struct snd_soc_codec *codec)
{
wm8961_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int wm8961_suspend(struct snd_soc_codec *codec)
{
wm8961_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
static int wm8961_resume(struct snd_soc_codec *codec) static int wm8961_resume(struct snd_soc_codec *codec)
{ {
snd_soc_cache_sync(codec); snd_soc_cache_sync(codec);
wm8961_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0; return 0;
} }
#else #else
#define wm8961_suspend NULL
#define wm8961_resume NULL #define wm8961_resume NULL
#endif #endif
static struct snd_soc_codec_driver soc_codec_dev_wm8961 = { static struct snd_soc_codec_driver soc_codec_dev_wm8961 = {
.probe = wm8961_probe, .probe = wm8961_probe,
.remove = wm8961_remove,
.suspend = wm8961_suspend,
.resume = wm8961_resume, .resume = wm8961_resume,
.set_bias_level = wm8961_set_bias_level, .set_bias_level = wm8961_set_bias_level,
.suspend_bias_off = true,
.controls = wm8961_snd_controls, .controls = wm8961_snd_controls,
.num_controls = ARRAY_SIZE(wm8961_snd_controls), .num_controls = ARRAY_SIZE(wm8961_snd_controls),