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

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

ASoC: wm8993: Cleanup manual bias level transitions 



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/wm8993.c

+0 −12
Original line number Diff line number Diff line
@@ -1486,7 +1486,6 @@ static int wm8993_probe(struct snd_soc_codec *codec) 
{

	struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	int ret;



	wm8993->hubs_data.hp_startup_mode = 1;

	wm8993->hubs_data.dcs_codes_l = -2;
@@ -1518,10 +1517,6 @@ static int wm8993_probe(struct snd_soc_codec *codec) 
				      wm8993->pdata.micbias1_lvl,

				      wm8993->pdata.micbias2_lvl);



	ret = wm8993_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	if (ret != 0)

		return ret;



	snd_soc_add_codec_controls(codec, wm8993_snd_controls,

			     ARRAY_SIZE(wm8993_snd_controls));

	if (wm8993->pdata.num_retune_configs != 0) {
@@ -1550,12 +1545,6 @@ static int wm8993_probe(struct snd_soc_codec *codec) 


}



static int wm8993_remove(struct snd_soc_codec *codec)

{

	wm8993_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



#ifdef CONFIG_PM

static int wm8993_suspend(struct snd_soc_codec *codec)

{
@@ -1629,7 +1618,6 @@ static const struct regmap_config wm8993_regmap = { 


static struct snd_soc_codec_driver soc_codec_dev_wm8993 = {

	.probe = 	wm8993_probe,

	.remove = 	wm8993_remove,

	.suspend =	wm8993_suspend,

	.resume =	wm8993_resume,

	.set_bias_level = wm8993_set_bias_level,