Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd5d3a15 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: adav80x: 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. While we are at it also remove the
regcache_cache_only() calls from suspend/resume as there shouldn't be any IO
between suspend and resume.

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>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0e0f9b96

sound/soc/codecs/adav80x.c

+2 −21
Original line number Diff line number Diff line
@@ -812,42 +812,23 @@ static int adav80x_probe(struct snd_soc_codec *codec) 
	/* Disable DAC zero flag */

	regmap_write(adav80x->regmap, ADAV80X_DAC_CTRL3, 0x6);



	return adav80x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

}



static int adav80x_suspend(struct snd_soc_codec *codec)

{

	struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);

	int ret;



	ret = adav80x_set_bias_level(codec, SND_SOC_BIAS_OFF);

	regcache_cache_only(adav80x->regmap, true);



	return ret;

	return 0;

}



static int adav80x_resume(struct snd_soc_codec *codec)

{

	struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);



	regcache_cache_only(adav80x->regmap, false);

	adav80x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	regcache_sync(adav80x->regmap);



	return 0;

}



static int adav80x_remove(struct snd_soc_codec *codec)

{

	return adav80x_set_bias_level(codec, SND_SOC_BIAS_OFF);

}



static struct snd_soc_codec_driver adav80x_codec_driver = {

	.probe = adav80x_probe,

	.remove = adav80x_remove,

	.suspend = adav80x_suspend,

	.resume = adav80x_resume,

	.set_bias_level = adav80x_set_bias_level,

	.suspend_bias_off = true,



	.set_pll = adav80x_set_pll,

	.set_sysclk = adav80x_set_sysclk,