openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: wm8753: 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:49 +02:00 committed by Mark Brown
parent 35afd9221b
commit a1f0b96749
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sound/soc/codecs/wm8753.c
View File

@ -1447,19 +1447,12 @@ static struct snd_soc_dai_driver wm8753_dai[] = {
}, },
}; };
static int wm8753_suspend(struct snd_soc_codec *codec)
{
wm8753_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
static int wm8753_resume(struct snd_soc_codec *codec) static int wm8753_resume(struct snd_soc_codec *codec)
{ {
struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec); struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec);
regcache_sync(wm8753->regmap); regcache_sync(wm8753->regmap);
wm8753_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0; return 0;
} }
@ -1476,7 +1469,6 @@ static int wm8753_probe(struct snd_soc_codec *codec)
return ret; return ret;
} }
wm8753_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
wm8753->dai_func = 0; wm8753->dai_func = 0;
/* set the update bits */ /* set the update bits */
@ -1494,20 +1486,11 @@ static int wm8753_probe(struct snd_soc_codec *codec)
return 0; return 0;
} }
/* power down chip */
static int wm8753_remove(struct snd_soc_codec *codec)
{
wm8753_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
static struct snd_soc_codec_driver soc_codec_dev_wm8753 = { static struct snd_soc_codec_driver soc_codec_dev_wm8753 = {
.probe = wm8753_probe, .probe = wm8753_probe,
.remove = wm8753_remove,
.suspend = wm8753_suspend,
.resume = wm8753_resume, .resume = wm8753_resume,
.set_bias_level = wm8753_set_bias_level, .set_bias_level = wm8753_set_bias_level,
.suspend_bias_off = true,
.controls = wm8753_snd_controls, .controls = wm8753_snd_controls,
.num_controls = ARRAY_SIZE(wm8753_snd_controls), .num_controls = ARRAY_SIZE(wm8753_snd_controls),