Commit 2a4bc751 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown

ASoC: cs42l56: 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: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarBrian Austin <brian.austin@cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 417c60e8
...@@ -1016,20 +1016,6 @@ static struct snd_soc_dai_driver cs42l56_dai = { ...@@ -1016,20 +1016,6 @@ static struct snd_soc_dai_driver cs42l56_dai = {
.ops = &cs42l56_ops, .ops = &cs42l56_ops,
}; };
static int cs42l56_suspend(struct snd_soc_codec *codec)
{
cs42l56_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
static int cs42l56_resume(struct snd_soc_codec *codec)
{
cs42l56_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0;
}
static int beep_freq[] = { static int beep_freq[] = {
261, 522, 585, 667, 706, 774, 889, 1000, 261, 522, 585, 667, 706, 774, 889, 1000,
1043, 1200, 1333, 1412, 1600, 1714, 2000, 2182 1043, 1200, 1333, 1412, 1600, 1714, 2000, 2182
...@@ -1168,15 +1154,12 @@ static int cs42l56_probe(struct snd_soc_codec *codec) ...@@ -1168,15 +1154,12 @@ static int cs42l56_probe(struct snd_soc_codec *codec)
{ {
cs42l56_init_beep(codec); cs42l56_init_beep(codec);
cs42l56_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0; return 0;
} }
static int cs42l56_remove(struct snd_soc_codec *codec) static int cs42l56_remove(struct snd_soc_codec *codec)
{ {
cs42l56_free_beep(codec); cs42l56_free_beep(codec);
cs42l56_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0; return 0;
} }
...@@ -1184,9 +1167,8 @@ static int cs42l56_remove(struct snd_soc_codec *codec) ...@@ -1184,9 +1167,8 @@ static int cs42l56_remove(struct snd_soc_codec *codec)
static struct snd_soc_codec_driver soc_codec_dev_cs42l56 = { static struct snd_soc_codec_driver soc_codec_dev_cs42l56 = {
.probe = cs42l56_probe, .probe = cs42l56_probe,
.remove = cs42l56_remove, .remove = cs42l56_remove,
.suspend = cs42l56_suspend,
.resume = cs42l56_resume,
.set_bias_level = cs42l56_set_bias_level, .set_bias_level = cs42l56_set_bias_level,
.suspend_bias_off = true,
.dapm_widgets = cs42l56_dapm_widgets, .dapm_widgets = cs42l56_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(cs42l56_dapm_widgets), .num_dapm_widgets = ARRAY_SIZE(cs42l56_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