Commit b515872e by Lars-Peter Clausen Committed by Nitin Garg

ASoC: wm8960: 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: 's avatarLars-Peter Clausen <lars@metafoo.de> Acked-by: 's avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: 's avatarMark Brown <broonie@kernel.org> (cherry picked from commit 0a87a6e1)
parent 7626324f
......@@ -946,22 +946,6 @@ static struct snd_soc_dai_driver wm8960_dai = {
.symmetric_rates = 1,
};
static int wm8960_suspend(struct snd_soc_codec *codec)
{
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
wm8960->set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
static int wm8960_resume(struct snd_soc_codec *codec)
{
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
wm8960->set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0;
}
static int wm8960_probe(struct snd_soc_codec *codec)
{
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
......@@ -985,8 +969,6 @@ static int wm8960_probe(struct snd_soc_codec *codec)
return ret;
}
wm8960->set_bias_level(codec, SND_SOC_BIAS_STANDBY);
/* Latch the update bits */
snd_soc_update_bits(codec, WM8960_LINVOL, 0x100, 0x100);
snd_soc_update_bits(codec, WM8960_RINVOL, 0x100, 0x100);
......@@ -1006,21 +988,10 @@ static int wm8960_probe(struct snd_soc_codec *codec)
return 0;
}
/* power down chip */
static int wm8960_remove(struct snd_soc_codec *codec)
{
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
wm8960->set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
static struct snd_soc_codec_driver soc_codec_dev_wm8960 = {
.probe = wm8960_probe,
.remove = wm8960_remove,
.suspend = wm8960_suspend,
.resume = wm8960_resume,
.set_bias_level = wm8960_set_bias_level,
.idle_bias_off = true,
};
static const struct regmap_config wm8960_regmap = {
......
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