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

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

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

sound/soc/codecs/wm8990.c

+2 −22
Original line number Original line Diff line number Diff line
@@ -1271,18 +1271,6 @@ static struct snd_soc_dai_driver wm8990_dai = { 
	.ops = &wm8990_dai_ops,

	.ops = &wm8990_dai_ops,

};

};





static int wm8990_suspend(struct snd_soc_codec *codec)

{

	wm8990_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static int wm8990_resume(struct snd_soc_codec *codec)

{

	wm8990_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	return 0;

}



/*

/*

 * initialise the WM8990 driver

 * initialise the WM8990 driver

 * register the mixer and dsp interfaces with the kernel

 * register the mixer and dsp interfaces with the kernel
@@ -1309,19 +1297,11 @@ static int wm8990_probe(struct snd_soc_codec *codec) 
	return 0;

	return 0;

}

}





/* power down chip */

static int wm8990_remove(struct snd_soc_codec *codec)

{

	wm8990_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static struct snd_soc_codec_driver soc_codec_dev_wm8990 = {

static struct snd_soc_codec_driver soc_codec_dev_wm8990 = {

	.probe =	wm8990_probe,

	.probe =	wm8990_probe,

	.remove =	wm8990_remove,

	.suspend =	wm8990_suspend,

	.resume =	wm8990_resume,

	.set_bias_level = wm8990_set_bias_level,

	.set_bias_level = wm8990_set_bias_level,

	.suspend_bias_off = true,



	.controls =	wm8990_snd_controls,

	.controls =	wm8990_snd_controls,

	.num_controls = ARRAY_SIZE(wm8990_snd_controls),

	.num_controls = ARRAY_SIZE(wm8990_snd_controls),

	.dapm_widgets = wm8990_dapm_widgets,

	.dapm_widgets = wm8990_dapm_widgets,