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

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

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

sound/soc/codecs/sta529.c

+2 −33
Original line number Original line Diff line number Diff line
@@ -319,41 +319,10 @@ static struct snd_soc_dai_driver sta529_dai = { 
	.ops	= &sta529_dai_ops,

	.ops	= &sta529_dai_ops,

};

};





static int sta529_probe(struct snd_soc_codec *codec)

{

	sta529_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	return 0;

}



/* power down chip */

static int sta529_remove(struct snd_soc_codec *codec)

{

	sta529_set_bias_level(codec, SND_SOC_BIAS_OFF);



	return 0;

}



static int sta529_suspend(struct snd_soc_codec *codec)

{

	sta529_set_bias_level(codec, SND_SOC_BIAS_OFF);



	return 0;

}



static int sta529_resume(struct snd_soc_codec *codec)

{

	sta529_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	return 0;

}



static const struct snd_soc_codec_driver sta529_codec_driver = {

static const struct snd_soc_codec_driver sta529_codec_driver = {

	.probe = sta529_probe,

	.remove = sta529_remove,

	.set_bias_level = sta529_set_bias_level,

	.set_bias_level = sta529_set_bias_level,

	.suspend = sta529_suspend,

	.suspend_bias_off = true,

	.resume = sta529_resume,



	.controls = sta529_snd_controls,

	.controls = sta529_snd_controls,

	.num_controls = ARRAY_SIZE(sta529_snd_controls),

	.num_controls = ARRAY_SIZE(sta529_snd_controls),

};

};