Commit 0bd324b1 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown

ASoC: wm8711: 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. Also remove the extra write that sets
the WM8711_ACTIVE register to 0x00 in the suspend handler since this write
is already done when transitioning to SND_SOC_BIAS_OFF.

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: 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 f114040e
...@@ -350,19 +350,6 @@ static struct snd_soc_dai_driver wm8711_dai = { ...@@ -350,19 +350,6 @@ static struct snd_soc_dai_driver wm8711_dai = {
.ops = &wm8711_ops, .ops = &wm8711_ops,
}; };
static int wm8711_suspend(struct snd_soc_codec *codec)
{
snd_soc_write(codec, WM8711_ACTIVE, 0x0);
wm8711_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
static int wm8711_resume(struct snd_soc_codec *codec)
{
wm8711_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0;
}
static int wm8711_probe(struct snd_soc_codec *codec) static int wm8711_probe(struct snd_soc_codec *codec)
{ {
int ret; int ret;
...@@ -373,8 +360,6 @@ static int wm8711_probe(struct snd_soc_codec *codec) ...@@ -373,8 +360,6 @@ static int wm8711_probe(struct snd_soc_codec *codec)
return ret; return ret;
} }
wm8711_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
/* Latch the update bits */ /* Latch the update bits */
snd_soc_update_bits(codec, WM8711_LOUT1V, 0x0100, 0x0100); snd_soc_update_bits(codec, WM8711_LOUT1V, 0x0100, 0x0100);
snd_soc_update_bits(codec, WM8711_ROUT1V, 0x0100, 0x0100); snd_soc_update_bits(codec, WM8711_ROUT1V, 0x0100, 0x0100);
...@@ -383,19 +368,11 @@ static int wm8711_probe(struct snd_soc_codec *codec) ...@@ -383,19 +368,11 @@ static int wm8711_probe(struct snd_soc_codec *codec)
} }
/* power down chip */
static int wm8711_remove(struct snd_soc_codec *codec)
{
wm8711_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
static struct snd_soc_codec_driver soc_codec_dev_wm8711 = { static struct snd_soc_codec_driver soc_codec_dev_wm8711 = {
.probe = wm8711_probe, .probe = wm8711_probe,
.remove = wm8711_remove,
.suspend = wm8711_suspend,
.resume = wm8711_resume,
.set_bias_level = wm8711_set_bias_level, .set_bias_level = wm8711_set_bias_level,
.suspend_bias_off = true,
.controls = wm8711_snd_controls, .controls = wm8711_snd_controls,
.num_controls = ARRAY_SIZE(wm8711_snd_controls), .num_controls = ARRAY_SIZE(wm8711_snd_controls),
.dapm_widgets = wm8711_dapm_widgets, .dapm_widgets = wm8711_dapm_widgets,
......
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