renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 18:23:53 +08:00
Code

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

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:27 +01:00 committed by Mark Brown
parent f114040e3e
commit 6c286afb01
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sound/soc/codecs/wm8776.c
View File

@ -408,24 +408,6 @@ static struct snd_soc_dai_driver wm8776_dai[] = {
}, },
}; };
#ifdef CONFIG_PM
static int wm8776_suspend(struct snd_soc_codec *codec)
{
wm8776_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
static int wm8776_resume(struct snd_soc_codec *codec)
{
wm8776_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0;
}
#else
#define wm8776_suspend NULL
#define wm8776_resume NULL
#endif
static int wm8776_probe(struct snd_soc_codec *codec) static int wm8776_probe(struct snd_soc_codec *codec)
{ {
int ret = 0; int ret = 0;
@ -436,8 +418,6 @@ static int wm8776_probe(struct snd_soc_codec *codec)
return ret; return ret;
} }
wm8776_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
/* Latch the update bits; right channel only since we always /* Latch the update bits; right channel only since we always
* update both. */ * update both. */
snd_soc_update_bits(codec, WM8776_HPRVOL, 0x100, 0x100); snd_soc_update_bits(codec, WM8776_HPRVOL, 0x100, 0x100);
@ -446,19 +426,10 @@ static int wm8776_probe(struct snd_soc_codec *codec)
return ret; return ret;
} }
/* power down chip */
static int wm8776_remove(struct snd_soc_codec *codec)
{
wm8776_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
static struct snd_soc_codec_driver soc_codec_dev_wm8776 = { static struct snd_soc_codec_driver soc_codec_dev_wm8776 = {
.probe = wm8776_probe, .probe = wm8776_probe,
.remove = wm8776_remove,
.suspend = wm8776_suspend,
.resume = wm8776_resume,
.set_bias_level = wm8776_set_bias_level, .set_bias_level = wm8776_set_bias_level,
.suspend_bias_off = true,
.controls = wm8776_snd_controls, .controls = wm8776_snd_controls,
.num_controls = ARRAY_SIZE(wm8776_snd_controls), .num_controls = ARRAY_SIZE(wm8776_snd_controls),