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

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

ASoC: wm8961: Replace direct snd_soc_codec dapm field access 



The dapm field of the snd_soc_codec struct is eventually going to be
removed, in preparation for this replace all manual access to
codec->dapm.bias_level with snd_soc_codec_get_bias_level().

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 93f32f53

sound/soc/codecs/wm8961.c

+2 −2
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ static int wm8961_set_bias_level(struct snd_soc_codec *codec, 
		break;



	case SND_SOC_BIAS_PREPARE:

		if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY) {

		if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_STANDBY) {

			/* Enable bias generation */

			reg = snd_soc_read(codec, WM8961_ANTI_POP);

			reg |= WM8961_BUFIOEN | WM8961_BUFDCOPEN;
@@ -773,7 +773,7 @@ static int wm8961_set_bias_level(struct snd_soc_codec *codec, 
		break;



	case SND_SOC_BIAS_STANDBY:

		if (codec->dapm.bias_level == SND_SOC_BIAS_PREPARE) {

		if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_PREPARE) {

			/* VREF off */

			reg = snd_soc_read(codec, WM8961_PWR_MGMT_1);

			reg &= ~WM8961_VREF;