mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-28 11:49:32 +00:00
ASoC: tlv320aic23: 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> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
bf9706fe95
commit
aabb87f003
1 changed files with 2 additions and 19 deletions
|
@ -540,19 +540,11 @@ static struct snd_soc_dai_driver tlv320aic23_dai = {
|
||||||
.ops = &tlv320aic23_dai_ops,
|
.ops = &tlv320aic23_dai_ops,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int tlv320aic23_suspend(struct snd_soc_codec *codec)
|
|
||||||
{
|
|
||||||
tlv320aic23_set_bias_level(codec, SND_SOC_BIAS_OFF);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int tlv320aic23_resume(struct snd_soc_codec *codec)
|
static int tlv320aic23_resume(struct snd_soc_codec *codec)
|
||||||
{
|
{
|
||||||
struct aic23 *aic23 = snd_soc_codec_get_drvdata(codec);
|
struct aic23 *aic23 = snd_soc_codec_get_drvdata(codec);
|
||||||
regcache_mark_dirty(aic23->regmap);
|
regcache_mark_dirty(aic23->regmap);
|
||||||
regcache_sync(aic23->regmap);
|
regcache_sync(aic23->regmap);
|
||||||
tlv320aic23_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -562,9 +554,6 @@ static int tlv320aic23_codec_probe(struct snd_soc_codec *codec)
|
||||||
/* Reset codec */
|
/* Reset codec */
|
||||||
snd_soc_write(codec, TLV320AIC23_RESET, 0);
|
snd_soc_write(codec, TLV320AIC23_RESET, 0);
|
||||||
|
|
||||||
/* power on device */
|
|
||||||
tlv320aic23_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
|
|
||||||
|
|
||||||
snd_soc_write(codec, TLV320AIC23_DIGT, TLV320AIC23_DEEMP_44K);
|
snd_soc_write(codec, TLV320AIC23_DIGT, TLV320AIC23_DEEMP_44K);
|
||||||
|
|
||||||
/* Unmute input */
|
/* Unmute input */
|
||||||
|
@ -589,18 +578,12 @@ static int tlv320aic23_codec_probe(struct snd_soc_codec *codec)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int tlv320aic23_remove(struct snd_soc_codec *codec)
|
|
||||||
{
|
|
||||||
tlv320aic23_set_bias_level(codec, SND_SOC_BIAS_OFF);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct snd_soc_codec_driver soc_codec_dev_tlv320aic23 = {
|
static struct snd_soc_codec_driver soc_codec_dev_tlv320aic23 = {
|
||||||
.probe = tlv320aic23_codec_probe,
|
.probe = tlv320aic23_codec_probe,
|
||||||
.remove = tlv320aic23_remove,
|
|
||||||
.suspend = tlv320aic23_suspend,
|
|
||||||
.resume = tlv320aic23_resume,
|
.resume = tlv320aic23_resume,
|
||||||
.set_bias_level = tlv320aic23_set_bias_level,
|
.set_bias_level = tlv320aic23_set_bias_level,
|
||||||
|
.suspend_bias_off = true,
|
||||||
|
|
||||||
.controls = tlv320aic23_snd_controls,
|
.controls = tlv320aic23_snd_controls,
|
||||||
.num_controls = ARRAY_SIZE(tlv320aic23_snd_controls),
|
.num_controls = ARRAY_SIZE(tlv320aic23_snd_controls),
|
||||||
.dapm_widgets = tlv320aic23_dapm_widgets,
|
.dapm_widgets = tlv320aic23_dapm_widgets,
|
||||||
|
|
Loading…
Reference in a new issue