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

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

ASoC: wm8350: 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 f114040e

sound/soc/codecs/wm8350.c

+1 −20
Original line number Original line Diff line number Diff line
@@ -1242,19 +1242,6 @@ static int wm8350_set_bias_level(struct snd_soc_codec *codec, 
	return 0;

	return 0;

}

}





static int wm8350_suspend(struct snd_soc_codec *codec)

{

	wm8350_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static int wm8350_resume(struct snd_soc_codec *codec)

{

	wm8350_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	return 0;

}



static void wm8350_hp_work(struct wm8350_data *priv,

static void wm8350_hp_work(struct wm8350_data *priv,

			   struct wm8350_jack_data *jack,

			   struct wm8350_jack_data *jack,

			   u16 mask)

			   u16 mask)
@@ -1565,9 +1552,6 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec) 
	wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_MICD,

	wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_MICD,

			    wm8350_mic_handler, 0, "Microphone detect", priv);

			    wm8350_mic_handler, 0, "Microphone detect", priv);







	wm8350_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	return 0;

	return 0;

}

}
@@ -1596,8 +1580,6 @@ static int wm8350_codec_remove(struct snd_soc_codec *codec) 
	 * wait for its completion */

	 * wait for its completion */

	flush_delayed_work(&codec->dapm.delayed_work);

	flush_delayed_work(&codec->dapm.delayed_work);





	wm8350_set_bias_level(codec, SND_SOC_BIAS_OFF);



	wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA);

	wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA);





	return 0;

	return 0;
@@ -1613,10 +1595,9 @@ static struct regmap *wm8350_get_regmap(struct device *dev) 
static struct snd_soc_codec_driver soc_codec_dev_wm8350 = {

static struct snd_soc_codec_driver soc_codec_dev_wm8350 = {

	.probe =	wm8350_codec_probe,

	.probe =	wm8350_codec_probe,

	.remove =	wm8350_codec_remove,

	.remove =	wm8350_codec_remove,

	.suspend = 	wm8350_suspend,

	.resume =	wm8350_resume,

	.get_regmap =	wm8350_get_regmap,

	.get_regmap =	wm8350_get_regmap,

	.set_bias_level = wm8350_set_bias_level,

	.set_bias_level = wm8350_set_bias_level,

	.suspend_bias_off = true,





	.controls = wm8350_snd_controls,

	.controls = wm8350_snd_controls,

	.num_controls = ARRAY_SIZE(wm8350_snd_controls),

	.num_controls = ARRAY_SIZE(wm8350_snd_controls),