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

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

ASoC: cs42l73: 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 2a4bc751

sound/soc/codecs/cs42l73.c

+1 −24
Original line number Diff line number Diff line
@@ -1330,25 +1330,10 @@ static struct snd_soc_dai_driver cs42l73_dai[] = { 
	 }

};



static int cs42l73_suspend(struct snd_soc_codec *codec)

{

	cs42l73_set_bias_level(codec, SND_SOC_BIAS_OFF);



	return 0;

}



static int cs42l73_resume(struct snd_soc_codec *codec)

{

	cs42l73_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	return 0;

}



static int cs42l73_probe(struct snd_soc_codec *codec)

{

	struct cs42l73_private *cs42l73 = snd_soc_codec_get_drvdata(codec);



	cs42l73_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	/* Set Charge Pump Frequency */

	if (cs42l73->pdata.chgfreq)

		snd_soc_update_bits(codec, CS42L73_CPFCHC,
@@ -1362,18 +1347,10 @@ static int cs42l73_probe(struct snd_soc_codec *codec) 
	return 0;

}



static int cs42l73_remove(struct snd_soc_codec *codec)

{

	cs42l73_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static struct snd_soc_codec_driver soc_codec_dev_cs42l73 = {

	.probe = cs42l73_probe,

	.remove = cs42l73_remove,

	.suspend = cs42l73_suspend,

	.resume = cs42l73_resume,

	.set_bias_level = cs42l73_set_bias_level,

	.suspend_bias_off = true,



	.dapm_widgets = cs42l73_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(cs42l73_dapm_widgets),