From: Lars-Peter Clausen <lars@metafoo.de>
Date: Mon, 1 Jun 2015 08:10:46 +0000 (+0200)
Subject: ASoC: wm8940: Replace direct snd_soc_codec dapm field access
X-Git-Tag: v4.2-rc1~55^2~48^2~1^2~24
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2145554fea759a303d31f64e5befc50996f42dd0;p=uclinux-h8%2Flinux.git

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: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index f2d6a490713f..98ef0ba5c2a4 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -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);
 		break;
 	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);
 			if (ret < 0) {
 				dev_err(codec->dev, "Failed to sync cache: %d\n", ret);