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

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

ASoC: wm8960: 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 e2280c90

sound/soc/codecs/wm8960.c

+1 −30
Original line number Diff line number Diff line
@@ -943,22 +943,6 @@ static struct snd_soc_dai_driver wm8960_dai = { 
	.symmetric_rates = 1,

};



static int wm8960_suspend(struct snd_soc_codec *codec)

{

	struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);



	wm8960->set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static int wm8960_resume(struct snd_soc_codec *codec)

{

	struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);



	wm8960->set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	return 0;

}



static int wm8960_probe(struct snd_soc_codec *codec)

{

	struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
@@ -976,8 +960,6 @@ static int wm8960_probe(struct snd_soc_codec *codec) 
		return ret;

	}



	wm8960->set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	/* Latch the update bits */

	snd_soc_update_bits(codec, WM8960_LINVOL, 0x100, 0x100);

	snd_soc_update_bits(codec, WM8960_RINVOL, 0x100, 0x100);
@@ -997,21 +979,10 @@ static int wm8960_probe(struct snd_soc_codec *codec) 
	return 0;

}



/* power down chip */

static int wm8960_remove(struct snd_soc_codec *codec)

{

	struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);



	wm8960->set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static struct snd_soc_codec_driver soc_codec_dev_wm8960 = {

	.probe =	wm8960_probe,

	.remove =	wm8960_remove,

	.suspend =	wm8960_suspend,

	.resume =	wm8960_resume,

	.set_bias_level = wm8960_set_bias_level,

	.suspend_bias_off = true,

};



static const struct regmap_config wm8960_regmap = {