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

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

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

+2 −30
Original line number Diff line number Diff line
@@ -1227,32 +1227,6 @@ static int wm8991_set_bias_level(struct snd_soc_codec *codec, 
	return 0;

}



static int wm8991_suspend(struct snd_soc_codec *codec)

{

	wm8991_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static int wm8991_resume(struct snd_soc_codec *codec)

{

	wm8991_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	return 0;

}



/* power down chip */

static int wm8991_remove(struct snd_soc_codec *codec)

{

	wm8991_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static int wm8991_probe(struct snd_soc_codec *codec)

{

	wm8991_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	return 0;

}



#define WM8991_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\

			SNDRV_PCM_FMTBIT_S24_LE)
@@ -1293,11 +1267,9 @@ static struct snd_soc_dai_driver wm8991_dai = { 
};



static struct snd_soc_codec_driver soc_codec_dev_wm8991 = {

	.probe = wm8991_probe,

	.remove = wm8991_remove,

	.suspend = wm8991_suspend,

	.resume = wm8991_resume,

	.set_bias_level = wm8991_set_bias_level,

	.suspend_bias_off = true,



	.controls = wm8991_snd_controls,

	.num_controls = ARRAY_SIZE(wm8991_snd_controls),

	.dapm_widgets = wm8991_dapm_widgets,