1 files changed, 17 insertions, 16 deletions

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 33be84e506ea..be90399c1cb4 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -1428,10 +1428,11 @@ static const struct snd_soc_dapm_route wm8912_intercon[] = {
 static int wm8904_add_widgets(struct snd_soc_codec *codec)
 {
         struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
 
-        snd_soc_dapm_new_controls(codec, wm8904_core_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, wm8904_core_dapm_widgets,
                                   ARRAY_SIZE(wm8904_core_dapm_widgets));
-        snd_soc_dapm_add_routes(codec, core_intercon,
+        snd_soc_dapm_add_routes(dapm, core_intercon,
                                 ARRAY_SIZE(core_intercon));
 
         switch (wm8904->devtype) {
@@ -1443,20 +1444,20 @@ static int wm8904_add_widgets(struct snd_soc_codec *codec)
                 snd_soc_add_controls(codec, wm8904_snd_controls,
                                      ARRAY_SIZE(wm8904_snd_controls));
 
-                snd_soc_dapm_new_controls(codec, wm8904_adc_dapm_widgets,
+                snd_soc_dapm_new_controls(dapm, wm8904_adc_dapm_widgets,
                                           ARRAY_SIZE(wm8904_adc_dapm_widgets));
-                snd_soc_dapm_new_controls(codec, wm8904_dac_dapm_widgets,
+                snd_soc_dapm_new_controls(dapm, wm8904_dac_dapm_widgets,
                                           ARRAY_SIZE(wm8904_dac_dapm_widgets));
-                snd_soc_dapm_new_controls(codec, wm8904_dapm_widgets,
+                snd_soc_dapm_new_controls(dapm, wm8904_dapm_widgets,
                                           ARRAY_SIZE(wm8904_dapm_widgets));
 
-                snd_soc_dapm_add_routes(codec, core_intercon,
+                snd_soc_dapm_add_routes(dapm, core_intercon,
                                         ARRAY_SIZE(core_intercon));
-                snd_soc_dapm_add_routes(codec, adc_intercon,
+                snd_soc_dapm_add_routes(dapm, adc_intercon,
                                         ARRAY_SIZE(adc_intercon));
-                snd_soc_dapm_add_routes(codec, dac_intercon,
+                snd_soc_dapm_add_routes(dapm, dac_intercon,
                                         ARRAY_SIZE(dac_intercon));
-                snd_soc_dapm_add_routes(codec, wm8904_intercon,
+                snd_soc_dapm_add_routes(dapm, wm8904_intercon,
                                         ARRAY_SIZE(wm8904_intercon));
                 break;
 
@@ -1464,17 +1465,17 @@ static int wm8904_add_widgets(struct snd_soc_codec *codec)
                 snd_soc_add_controls(codec, wm8904_dac_snd_controls,
                                      ARRAY_SIZE(wm8904_dac_snd_controls));
 
-                snd_soc_dapm_new_controls(codec, wm8904_dac_dapm_widgets,
+                snd_soc_dapm_new_controls(dapm, wm8904_dac_dapm_widgets,
                                           ARRAY_SIZE(wm8904_dac_dapm_widgets));
 
-                snd_soc_dapm_add_routes(codec, dac_intercon,
+                snd_soc_dapm_add_routes(dapm, dac_intercon,
                                         ARRAY_SIZE(dac_intercon));
-                snd_soc_dapm_add_routes(codec, wm8912_intercon,
+                snd_soc_dapm_add_routes(dapm, wm8912_intercon,
                                         ARRAY_SIZE(wm8912_intercon));
                 break;
         }
 
-        snd_soc_dapm_new_widgets(codec);
+        snd_soc_dapm_new_widgets(dapm);
         return 0;
 }
 
@@ -2139,7 +2140,7 @@ static int wm8904_set_bias_level(struct snd_soc_codec *codec,
                 break;
 
         case SND_SOC_BIAS_STANDBY:
-                if (codec->bias_level == SND_SOC_BIAS_OFF) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         ret = regulator_bulk_enable(ARRAY_SIZE(wm8904->supplies),
                                                     wm8904->supplies);
                         if (ret != 0) {
@@ -2198,7 +2199,7 @@ static int wm8904_set_bias_level(struct snd_soc_codec *codec,
                                        wm8904->supplies);
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
@@ -2373,7 +2374,7 @@ static int wm8904_probe(struct snd_soc_codec *codec)
         int ret, i;
 
         codec->cache_sync = 1;
-        codec->idle_bias_off = 1;
+        codec->dapm.idle_bias_off = 1;
 
         switch (wm8904->devtype) {
         case WM8904: