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

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

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

+1 −30
Original line number Diff line number Diff line
@@ -408,24 +408,6 @@ static struct snd_soc_dai_driver wm8776_dai[] = { 
	},

};



#ifdef CONFIG_PM

static int wm8776_suspend(struct snd_soc_codec *codec)

{

	wm8776_set_bias_level(codec, SND_SOC_BIAS_OFF);



	return 0;

}



static int wm8776_resume(struct snd_soc_codec *codec)

{

	wm8776_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	return 0;

}

#else

#define wm8776_suspend NULL

#define wm8776_resume NULL

#endif



static int wm8776_probe(struct snd_soc_codec *codec)

{

	int ret = 0;
@@ -436,8 +418,6 @@ static int wm8776_probe(struct snd_soc_codec *codec) 
		return ret;

	}



	wm8776_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	/* Latch the update bits; right channel only since we always

	 * update both. */

	snd_soc_update_bits(codec, WM8776_HPRVOL, 0x100, 0x100);
@@ -446,19 +426,10 @@ static int wm8776_probe(struct snd_soc_codec *codec) 
	return ret;

}



/* power down chip */

static int wm8776_remove(struct snd_soc_codec *codec)

{

	wm8776_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static struct snd_soc_codec_driver soc_codec_dev_wm8776 = {

	.probe = 	wm8776_probe,

	.remove = 	wm8776_remove,

	.suspend = 	wm8776_suspend,

	.resume =	wm8776_resume,

	.set_bias_level = wm8776_set_bias_level,

	.suspend_bias_off = true,



	.controls = wm8776_snd_controls,

	.num_controls = ARRAY_SIZE(wm8776_snd_controls),