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

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

ASoC: wm8940: 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>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f114040e

sound/soc/codecs/wm8940.c

+2 −20
Original line number Diff line number Diff line
@@ -695,17 +695,6 @@ static struct snd_soc_dai_driver wm8940_dai = { 
	.symmetric_rates = 1,

};



static int wm8940_suspend(struct snd_soc_codec *codec)

{

	return wm8940_set_bias_level(codec, SND_SOC_BIAS_OFF);

}



static int wm8940_resume(struct snd_soc_codec *codec)

{

	wm8940_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	return 0;

}



static int wm8940_probe(struct snd_soc_codec *codec)

{

	struct wm8940_setup_data *pdata = codec->dev->platform_data;
@@ -736,18 +725,11 @@ static int wm8940_probe(struct snd_soc_codec *codec) 
	return ret;

}



static int wm8940_remove(struct snd_soc_codec *codec)

{

	wm8940_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static struct snd_soc_codec_driver soc_codec_dev_wm8940 = {

	.probe =	wm8940_probe,

	.remove =	wm8940_remove,

	.suspend =	wm8940_suspend,

	.resume =	wm8940_resume,

	.set_bias_level = wm8940_set_bias_level,

	.suspend_bias_off = true,



	.controls =     wm8940_snd_controls,

	.num_controls = ARRAY_SIZE(wm8940_snd_controls),

	.dapm_widgets = wm8940_dapm_widgets,