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

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

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

+1 −28
Original line number Diff line number Diff line
@@ -372,23 +372,6 @@ static struct snd_soc_dai_driver wm8523_dai = { 
	.ops = &wm8523_dai_ops,

};



#ifdef CONFIG_PM

static int wm8523_suspend(struct snd_soc_codec *codec)

{

	wm8523_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static int wm8523_resume(struct snd_soc_codec *codec)

{

	wm8523_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	return 0;

}

#else

#define wm8523_suspend NULL

#define wm8523_resume NULL

#endif



static int wm8523_probe(struct snd_soc_codec *codec)

{

	struct wm8523_priv *wm8523 = snd_soc_codec_get_drvdata(codec);
@@ -402,23 +385,13 @@ static int wm8523_probe(struct snd_soc_codec *codec) 
			    WM8523_DACR_VU, WM8523_DACR_VU);

	snd_soc_update_bits(codec, WM8523_DAC_CTRL3, WM8523_ZC, WM8523_ZC);



	wm8523_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	return 0;

}



static int wm8523_remove(struct snd_soc_codec *codec)

{

	wm8523_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static struct snd_soc_codec_driver soc_codec_dev_wm8523 = {

	.probe =	wm8523_probe,

	.remove =	wm8523_remove,

	.suspend =	wm8523_suspend,

	.resume =	wm8523_resume,

	.set_bias_level = wm8523_set_bias_level,

	.suspend_bias_off = true,



	.controls = wm8523_controls,

	.num_controls = ARRAY_SIZE(wm8523_controls),