Commit 2081b2cf authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown

ASoC: wm8731: 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.
Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cea82d8a
...@@ -559,25 +559,6 @@ static struct snd_soc_dai_driver wm8731_dai = { ...@@ -559,25 +559,6 @@ static struct snd_soc_dai_driver wm8731_dai = {
.symmetric_rates = 1, .symmetric_rates = 1,
}; };
#ifdef CONFIG_PM
static int wm8731_suspend(struct snd_soc_codec *codec)
{
wm8731_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
static int wm8731_resume(struct snd_soc_codec *codec)
{
wm8731_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0;
}
#else
#define wm8731_suspend NULL
#define wm8731_resume NULL
#endif
static int wm8731_probe(struct snd_soc_codec *codec) static int wm8731_probe(struct snd_soc_codec *codec)
{ {
struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
...@@ -633,8 +614,6 @@ static int wm8731_remove(struct snd_soc_codec *codec) ...@@ -633,8 +614,6 @@ static int wm8731_remove(struct snd_soc_codec *codec)
{ {
struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
wm8731_set_bias_level(codec, SND_SOC_BIAS_OFF);
regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies); regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);
return 0; return 0;
...@@ -643,9 +622,9 @@ static int wm8731_remove(struct snd_soc_codec *codec) ...@@ -643,9 +622,9 @@ static int wm8731_remove(struct snd_soc_codec *codec)
static struct snd_soc_codec_driver soc_codec_dev_wm8731 = { static struct snd_soc_codec_driver soc_codec_dev_wm8731 = {
.probe = wm8731_probe, .probe = wm8731_probe,
.remove = wm8731_remove, .remove = wm8731_remove,
.suspend = wm8731_suspend,
.resume = wm8731_resume,
.set_bias_level = wm8731_set_bias_level, .set_bias_level = wm8731_set_bias_level,
.suspend_bias_off = true,
.dapm_widgets = wm8731_dapm_widgets, .dapm_widgets = wm8731_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets), .num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets),
.dapm_routes = wm8731_intercon, .dapm_routes = wm8731_intercon,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment