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

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

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

sound/soc/codecs/wm8985.c

+1 −27
Original line number Diff line number Diff line
@@ -961,29 +961,6 @@ static int wm8985_set_bias_level(struct snd_soc_codec *codec, 
	return 0;

}



#ifdef CONFIG_PM

static int wm8985_suspend(struct snd_soc_codec *codec)

{

	wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static int wm8985_resume(struct snd_soc_codec *codec)

{

	wm8985_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	return 0;

}

#else

#define wm8985_suspend NULL

#define wm8985_resume NULL

#endif



static int wm8985_remove(struct snd_soc_codec *codec)

{

	wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static int wm8985_probe(struct snd_soc_codec *codec)

{

	size_t i;
@@ -1023,7 +1000,6 @@ static int wm8985_probe(struct snd_soc_codec *codec) 
	snd_soc_update_bits(codec, WM8985_BIAS_CTRL, WM8985_BIASCUT,

			    WM8985_BIASCUT);



	wm8985_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	return 0;



err_reg_enable:
@@ -1064,10 +1040,8 @@ static struct snd_soc_dai_driver wm8985_dai = { 


static struct snd_soc_codec_driver soc_codec_dev_wm8985 = {

	.probe = wm8985_probe,

	.remove = wm8985_remove,

	.suspend = wm8985_suspend,

	.resume = wm8985_resume,

	.set_bias_level = wm8985_set_bias_level,

	.suspend_bias_off = true,



	.controls = wm8985_snd_controls,

	.num_controls = ARRAY_SIZE(wm8985_snd_controls),