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

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

ASoC: wm8983: 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/wm8983.c

+1 −26
Original line number Diff line number Diff line
@@ -967,29 +967,6 @@ static int wm8983_set_bias_level(struct snd_soc_codec *codec, 
	return 0;

}



#ifdef CONFIG_PM

static int wm8983_suspend(struct snd_soc_codec *codec)

{

	wm8983_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static int wm8983_resume(struct snd_soc_codec *codec)

{

	wm8983_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	return 0;

}

#else

#define wm8983_suspend NULL

#define wm8983_resume NULL

#endif



static int wm8983_remove(struct snd_soc_codec *codec)

{

	wm8983_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static int wm8983_probe(struct snd_soc_codec *codec)

{

	int ret;
@@ -1055,10 +1032,8 @@ static struct snd_soc_dai_driver wm8983_dai = { 


static struct snd_soc_codec_driver soc_codec_dev_wm8983 = {

	.probe = wm8983_probe,

	.remove = wm8983_remove,

	.suspend = wm8983_suspend,

	.resume = wm8983_resume,

	.set_bias_level = wm8983_set_bias_level,

	.suspend_bias_off = true,

	.controls = wm8983_snd_controls,

	.num_controls = ARRAY_SIZE(wm8983_snd_controls),

	.dapm_widgets = wm8983_dapm_widgets,