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

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

ASoC: wm8940: 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 f44a9842

sound/soc/codecs/wm8940.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -492,7 +492,7 @@ static int wm8940_set_bias_level(struct snd_soc_codec *codec, 
		ret = snd_soc_write(codec, WM8940_POWER1, pwr_reg | 0x1);

		ret = snd_soc_write(codec, WM8940_POWER1, pwr_reg | 0x1);

		break;

		break;

	case SND_SOC_BIAS_STANDBY:

	case SND_SOC_BIAS_STANDBY:

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

		if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) {

			ret = regcache_sync(wm8940->regmap);

			ret = regcache_sync(wm8940->regmap);

			if (ret < 0) {

			if (ret < 0) {

				dev_err(codec->dev, "Failed to sync cache: %d\n", ret);

				dev_err(codec->dev, "Failed to sync cache: %d\n", ret);