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

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

ASoC: sta350: 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.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f114040e

sound/soc/codecs/sta350.c

+1 −20
Original line number Original line Diff line number Diff line
@@ -912,23 +912,6 @@ static struct snd_soc_dai_driver sta350_dai = { 
	.ops = &sta350_dai_ops,

	.ops = &sta350_dai_ops,

};

};





#ifdef CONFIG_PM

static int sta350_suspend(struct snd_soc_codec *codec)

{

	sta350_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static int sta350_resume(struct snd_soc_codec *codec)

{

	sta350_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	return 0;

}

#else

#define sta350_suspend NULL

#define sta350_resume NULL

#endif



static int sta350_probe(struct snd_soc_codec *codec)

static int sta350_probe(struct snd_soc_codec *codec)

{

{

	struct sta350_priv *sta350 = snd_soc_codec_get_drvdata(codec);

	struct sta350_priv *sta350 = snd_soc_codec_get_drvdata(codec);
@@ -1065,7 +1048,6 @@ static int sta350_remove(struct snd_soc_codec *codec) 
{

{

	struct sta350_priv *sta350 = snd_soc_codec_get_drvdata(codec);

	struct sta350_priv *sta350 = snd_soc_codec_get_drvdata(codec);





	sta350_set_bias_level(codec, SND_SOC_BIAS_OFF);

	regulator_bulk_disable(ARRAY_SIZE(sta350->supplies), sta350->supplies);

	regulator_bulk_disable(ARRAY_SIZE(sta350->supplies), sta350->supplies);





	return 0;

	return 0;
@@ -1074,9 +1056,8 @@ static int sta350_remove(struct snd_soc_codec *codec) 
static const struct snd_soc_codec_driver sta350_codec = {

static const struct snd_soc_codec_driver sta350_codec = {

	.probe =		sta350_probe,

	.probe =		sta350_probe,

	.remove =		sta350_remove,

	.remove =		sta350_remove,

	.suspend =		sta350_suspend,

	.resume =		sta350_resume,

	.set_bias_level =	sta350_set_bias_level,

	.set_bias_level =	sta350_set_bias_level,

	.suspend_bias_off =	true,

	.controls =		sta350_snd_controls,

	.controls =		sta350_snd_controls,

	.num_controls =		ARRAY_SIZE(sta350_snd_controls),

	.num_controls =		ARRAY_SIZE(sta350_snd_controls),

	.dapm_widgets =		sta350_dapm_widgets,

	.dapm_widgets =		sta350_dapm_widgets,