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

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

ASoC: wm8804: Remove unnecessary suspend/resume bias level changes 



The ASoC core will only call the suspend/resume callbacks when the device's
DAPM context is idle. Since this driver sets idle_bias_off to true this
means that the device is already in SND_SOC_BIAS_OFF when the suspend
callback is called, so there is no need to manually set this state again.
There is also no need to go to SND_SOC_BIAS_STANDBY in the resume callback
since the core will go right back to SND_SOC_BIAS_OFF.

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 7d1a99da

sound/soc/codecs/wm8804.c

+0 −19
Original line number Diff line number Diff line
@@ -518,23 +518,6 @@ static int wm8804_set_bias_level(struct snd_soc_codec *codec, 
	return 0;

}



#ifdef CONFIG_PM

static int wm8804_suspend(struct snd_soc_codec *codec)

{

	wm8804_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static int wm8804_resume(struct snd_soc_codec *codec)

{

	wm8804_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	return 0;

}

#else

#define wm8804_suspend NULL

#define wm8804_resume NULL

#endif



static int wm8804_remove(struct snd_soc_codec *codec)

{

	struct wm8804_priv *wm8804;
@@ -671,8 +654,6 @@ static struct snd_soc_dai_driver wm8804_dai = { 
static struct snd_soc_codec_driver soc_codec_dev_wm8804 = {

	.probe = wm8804_probe,

	.remove = wm8804_remove,

	.suspend = wm8804_suspend,

	.resume = wm8804_resume,

	.set_bias_level = wm8804_set_bias_level,

	.idle_bias_off = true,