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

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

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

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 2a93f709

sound/soc/codecs/ml26124.c

+1 −23
Original line number Diff line number Diff line
@@ -565,41 +565,19 @@ static struct snd_soc_dai_driver ml26124_dai = { 
	.symmetric_rates = 1,

};



#ifdef CONFIG_PM

static int ml26124_suspend(struct snd_soc_codec *codec)

{

	ml26124_set_bias_level(codec, SND_SOC_BIAS_OFF);



	return 0;

}



static int ml26124_resume(struct snd_soc_codec *codec)

{

	ml26124_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	return 0;

}

#else

#define ml26124_suspend NULL

#define ml26124_resume NULL

#endif



static int ml26124_probe(struct snd_soc_codec *codec)

{

	/* Software Reset */

	snd_soc_update_bits(codec, ML26124_SW_RST, 0x01, 1);

	snd_soc_update_bits(codec, ML26124_SW_RST, 0x01, 0);



	ml26124_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	return 0;

}



static struct snd_soc_codec_driver soc_codec_dev_ml26124 = {

	.probe =	ml26124_probe,

	.suspend =	ml26124_suspend,

	.resume =	ml26124_resume,

	.set_bias_level = ml26124_set_bias_level,

	.suspend_bias_off = true,

	.dapm_widgets = ml26124_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(ml26124_dapm_widgets),

	.dapm_routes = ml26124_intercon,