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

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

ASoC: cs42l52: 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 de3ac810

sound/soc/codecs/cs42l52.c

+1 −19
Original line number Original line Diff line number Diff line
@@ -946,20 +946,6 @@ static struct snd_soc_dai_driver cs42l52_dai = { 
		.ops = &cs42l52_ops,

		.ops = &cs42l52_ops,

};

};





static int cs42l52_suspend(struct snd_soc_codec *codec)

{

	cs42l52_set_bias_level(codec, SND_SOC_BIAS_OFF);



	return 0;

}



static int cs42l52_resume(struct snd_soc_codec *codec)

{

	cs42l52_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	return 0;

}



static int beep_rates[] = {

static int beep_rates[] = {

	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
@@ -1104,8 +1090,6 @@ static int cs42l52_probe(struct snd_soc_codec *codec) 




	cs42l52_init_beep(codec);

	cs42l52_init_beep(codec);





	cs42l52_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	cs42l52->sysclk = CS42L52_DEFAULT_CLK;

	cs42l52->sysclk = CS42L52_DEFAULT_CLK;

	cs42l52->config.format = CS42L52_DEFAULT_FORMAT;

	cs42l52->config.format = CS42L52_DEFAULT_FORMAT;
@@ -1115,7 +1099,6 @@ static int cs42l52_probe(struct snd_soc_codec *codec) 
static int cs42l52_remove(struct snd_soc_codec *codec)

static int cs42l52_remove(struct snd_soc_codec *codec)

{

{

	cs42l52_free_beep(codec);

	cs42l52_free_beep(codec);

	cs42l52_set_bias_level(codec, SND_SOC_BIAS_OFF);





	return 0;

	return 0;

}

}
@@ -1123,9 +1106,8 @@ static int cs42l52_remove(struct snd_soc_codec *codec) 
static struct snd_soc_codec_driver soc_codec_dev_cs42l52 = {

static struct snd_soc_codec_driver soc_codec_dev_cs42l52 = {

	.probe = cs42l52_probe,

	.probe = cs42l52_probe,

	.remove = cs42l52_remove,

	.remove = cs42l52_remove,

	.suspend = cs42l52_suspend,

	.resume = cs42l52_resume,

	.set_bias_level = cs42l52_set_bias_level,

	.set_bias_level = cs42l52_set_bias_level,

	.suspend_bias_off = true,





	.dapm_widgets = cs42l52_dapm_widgets,

	.dapm_widgets = cs42l52_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(cs42l52_dapm_widgets),

	.num_dapm_widgets = ARRAY_SIZE(cs42l52_dapm_widgets),