ASoC: Decouple DAPM from CODECs

Decoupling Dynamic Audio Power Management (DAPM) from codec devices is
required when developing ASoC further. Such as for other ASoC components to
have DAPM widgets or when extending DAPM to handle cross-device paths.

This patch decouples DAPM related variables from struct snd_soc_codec and
moves them to new struct snd_soc_dapm_context that is used to encapsulate
DAPM context of a device. ASoC core and API of DAPM functions are modified
to use DAPM context instead of codec.

This patch does not change current functionality and a large part of changes
come because of structure and internal API changes.

Core implementation is from Liam Girdwood <lrg@slimlogic.co.uk> with some
minor core changes, codecs and machine driver conversions from
Jarkko Nikula <jhnikula@gmail.com>.

Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Manuel Lauss <manuel.lauss@googlemail.com>
Cc: Mike Frysinger <vapier.adi@gmail.com>
Cc: Cliff Cai <cliff.cai@analog.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Ryan Mallon <ryan@bluewatersys.com>
Cc: Timur Tabi <timur@freescale.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Jassi Brar <jassi.brar@samsung.com>
Cc: Daniel Gloeckner <dg@emlix.com>
Cc: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

10 files changed, 160 insertions, 147 deletions

diff --git a/sound/soc/s3c24xx/aquila_wm8994.c b/sound/soc/s3c24xx/aquila_wm8994.c
index 235d1973f7d0..33bebdae08a7 100644
--- a/sound/soc/s3c24xx/aquila_wm8994.c
+++ b/sound/soc/s3c24xx/aquila_wm8994.c
@@ -93,27 +93,28 @@ static const struct snd_soc_dapm_route aquila_dapm_routes[] = {
 static int aquila_wm8994_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret;
 
         /* add aquila specific widgets */
-        snd_soc_dapm_new_controls(codec, aquila_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, aquila_dapm_widgets,
                         ARRAY_SIZE(aquila_dapm_widgets));
 
         /* set up aquila specific audio routes */
-        snd_soc_dapm_add_routes(codec, aquila_dapm_routes,
+        snd_soc_dapm_add_routes(dapm, aquila_dapm_routes,
                         ARRAY_SIZE(aquila_dapm_routes));
 
         /* set endpoints to not connected */
-        snd_soc_dapm_nc_pin(codec, "IN2LP:VXRN");
-        snd_soc_dapm_nc_pin(codec, "IN2RP:VXRP");
-        snd_soc_dapm_nc_pin(codec, "LINEOUT1N");
-        snd_soc_dapm_nc_pin(codec, "LINEOUT1P");
-        snd_soc_dapm_nc_pin(codec, "LINEOUT2N");
-        snd_soc_dapm_nc_pin(codec, "LINEOUT2P");
-        snd_soc_dapm_nc_pin(codec, "SPKOUTRN");
-        snd_soc_dapm_nc_pin(codec, "SPKOUTRP");
-
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_nc_pin(dapm, "IN2LP:VXRN");
+        snd_soc_dapm_nc_pin(dapm, "IN2RP:VXRP");
+        snd_soc_dapm_nc_pin(dapm, "LINEOUT1N");
+        snd_soc_dapm_nc_pin(dapm, "LINEOUT1P");
+        snd_soc_dapm_nc_pin(dapm, "LINEOUT2N");
+        snd_soc_dapm_nc_pin(dapm, "LINEOUT2P");
+        snd_soc_dapm_nc_pin(dapm, "SPKOUTRN");
+        snd_soc_dapm_nc_pin(dapm, "SPKOUTRP");
+
+        snd_soc_dapm_sync(dapm);
 
         /* Headset jack detection */
         ret = snd_soc_jack_new(&aquila, "Headset Jack",
diff --git a/sound/soc/s3c24xx/goni_wm8994.c b/sound/soc/s3c24xx/goni_wm8994.c
index 694f702cc8e2..052729c6540d 100644
--- a/sound/soc/s3c24xx/goni_wm8994.c
+++ b/sound/soc/s3c24xx/goni_wm8994.c
@@ -97,25 +97,26 @@ static const struct snd_soc_dapm_route goni_dapm_routes[] = {
 static int goni_wm8994_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret;
 
         /* add goni specific widgets */
-        snd_soc_dapm_new_controls(codec, goni_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, goni_dapm_widgets,
                         ARRAY_SIZE(goni_dapm_widgets));
 
         /* set up goni specific audio routes */
-        snd_soc_dapm_add_routes(codec, goni_dapm_routes,
+        snd_soc_dapm_add_routes(dapm, goni_dapm_routes,
                         ARRAY_SIZE(goni_dapm_routes));
 
         /* set endpoints to not connected */
-        snd_soc_dapm_nc_pin(codec, "IN2LP:VXRN");
-        snd_soc_dapm_nc_pin(codec, "IN2RP:VXRP");
-        snd_soc_dapm_nc_pin(codec, "LINEOUT1N");
-        snd_soc_dapm_nc_pin(codec, "LINEOUT1P");
-        snd_soc_dapm_nc_pin(codec, "LINEOUT2N");
-        snd_soc_dapm_nc_pin(codec, "LINEOUT2P");
-
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_nc_pin(dapm, "IN2LP:VXRN");
+        snd_soc_dapm_nc_pin(dapm, "IN2RP:VXRP");
+        snd_soc_dapm_nc_pin(dapm, "LINEOUT1N");
+        snd_soc_dapm_nc_pin(dapm, "LINEOUT1P");
+        snd_soc_dapm_nc_pin(dapm, "LINEOUT2N");
+        snd_soc_dapm_nc_pin(dapm, "LINEOUT2P");
+
+        snd_soc_dapm_sync(dapm);
 
         /* Headset jack detection */
         ret = snd_soc_jack_new(&goni, "Headset Jack",
diff --git a/sound/soc/s3c24xx/jive_wm8750.c b/sound/soc/s3c24xx/jive_wm8750.c
index 49605cd83947..e3599e283568 100644
--- a/sound/soc/s3c24xx/jive_wm8750.c
+++ b/sound/soc/s3c24xx/jive_wm8750.c
@@ -111,18 +111,19 @@ static struct snd_soc_ops jive_ops = {
 static int jive_wm8750_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err;
 
         /* These endpoints are not being used. */
-        snd_soc_dapm_nc_pin(codec, "LINPUT2");
-        snd_soc_dapm_nc_pin(codec, "RINPUT2");
-        snd_soc_dapm_nc_pin(codec, "LINPUT3");
-        snd_soc_dapm_nc_pin(codec, "RINPUT3");
-        snd_soc_dapm_nc_pin(codec, "OUT3");
-        snd_soc_dapm_nc_pin(codec, "MONO");
+        snd_soc_dapm_nc_pin(dapm, "LINPUT2");
+        snd_soc_dapm_nc_pin(dapm, "RINPUT2");
+        snd_soc_dapm_nc_pin(dapm, "LINPUT3");
+        snd_soc_dapm_nc_pin(dapm, "RINPUT3");
+        snd_soc_dapm_nc_pin(dapm, "OUT3");
+        snd_soc_dapm_nc_pin(dapm, "MONO");
 
         /* Add jive specific widgets */
-        err = snd_soc_dapm_new_controls(codec, wm8750_dapm_widgets,
+        err = snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets,
                                         ARRAY_SIZE(wm8750_dapm_widgets));
         if (err) {
                 printk(KERN_ERR "%s: failed to add widgets (%d)\n",
@@ -130,8 +131,8 @@ static int jive_wm8750_init(struct snd_soc_pcm_runtime *rtd)
                 return err;
         }
 
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_sync(dapm);
 
         return 0;
 }
diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
index e97bdf150a03..c3f63ef8ab12 100644
--- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
@@ -333,16 +333,17 @@ static const struct snd_kcontrol_new wm8753_neo1973_gta02_controls[] = {
 static int neo1973_gta02_wm8753_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err;
 
         /* set up NC codec pins */
-        snd_soc_dapm_nc_pin(codec, "OUT3");
-        snd_soc_dapm_nc_pin(codec, "OUT4");
-        snd_soc_dapm_nc_pin(codec, "LINE1");
-        snd_soc_dapm_nc_pin(codec, "LINE2");
+        snd_soc_dapm_nc_pin(dapm, "OUT3");
+        snd_soc_dapm_nc_pin(dapm, "OUT4");
+        snd_soc_dapm_nc_pin(dapm, "LINE1");
+        snd_soc_dapm_nc_pin(dapm, "LINE2");
 
         /* Add neo1973 gta02 specific widgets */
-        snd_soc_dapm_new_controls(codec, wm8753_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, wm8753_dapm_widgets,
                                   ARRAY_SIZE(wm8753_dapm_widgets));
 
         /* add neo1973 gta02 specific controls */
@@ -353,25 +354,25 @@ static int neo1973_gta02_wm8753_init(struct snd_soc_pcm_runtime *rtd)
                 return err;
 
         /* set up neo1973 gta02 specific audio path audio_map */
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
         /* set endpoints to default off mode */
-        snd_soc_dapm_disable_pin(codec, "Stereo Out");
-        snd_soc_dapm_disable_pin(codec, "GSM Line Out");
-        snd_soc_dapm_disable_pin(codec, "GSM Line In");
-        snd_soc_dapm_disable_pin(codec, "Headset Mic");
-        snd_soc_dapm_disable_pin(codec, "Handset Mic");
-        snd_soc_dapm_disable_pin(codec, "Handset Spk");
+        snd_soc_dapm_disable_pin(dapm, "Stereo Out");
+        snd_soc_dapm_disable_pin(dapm, "GSM Line Out");
+        snd_soc_dapm_disable_pin(dapm, "GSM Line In");
+        snd_soc_dapm_disable_pin(dapm, "Headset Mic");
+        snd_soc_dapm_disable_pin(dapm, "Handset Mic");
+        snd_soc_dapm_disable_pin(dapm, "Handset Spk");
 
         /* allow audio paths from the GSM modem to run during suspend */
-        snd_soc_dapm_ignore_suspend(codec, "Stereo Out");
-        snd_soc_dapm_ignore_suspend(codec, "GSM Line Out");
-        snd_soc_dapm_ignore_suspend(codec, "GSM Line In");
-        snd_soc_dapm_ignore_suspend(codec, "Headset Mic");
-        snd_soc_dapm_ignore_suspend(codec, "Handset Mic");
-        snd_soc_dapm_ignore_suspend(codec, "Handset Spk");
-
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_ignore_suspend(dapm, "Stereo Out");
+        snd_soc_dapm_ignore_suspend(dapm, "GSM Line Out");
+        snd_soc_dapm_ignore_suspend(dapm, "GSM Line In");
+        snd_soc_dapm_ignore_suspend(dapm, "Headset Mic");
+        snd_soc_dapm_ignore_suspend(dapm, "Handset Mic");
+        snd_soc_dapm_ignore_suspend(dapm, "Handset Spk");
+
+        snd_soc_dapm_sync(dapm);
 
         return 0;
 }
diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
index f4f2ee731f01..e94ffe01a4a5 100644
--- a/sound/soc/s3c24xx/neo1973_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_wm8753.c
@@ -237,81 +237,83 @@ static int neo1973_get_scenario(struct snd_kcontrol *kcontrol,
 
 static int set_scenario_endpoints(struct snd_soc_codec *codec, int scenario)
 {
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
         pr_debug("Entered %s\n", __func__);
 
         switch (neo1973_scenario) {
         case NEO_AUDIO_OFF:
-                snd_soc_dapm_disable_pin(codec, "Audio Out");
-                snd_soc_dapm_disable_pin(codec, "GSM Line Out");
-                snd_soc_dapm_disable_pin(codec, "GSM Line In");
-                snd_soc_dapm_disable_pin(codec, "Headset Mic");
-                snd_soc_dapm_disable_pin(codec, "Call Mic");
+                snd_soc_dapm_disable_pin(dapm, "Audio Out");
+                snd_soc_dapm_disable_pin(dapm, "GSM Line Out");
+                snd_soc_dapm_disable_pin(dapm, "GSM Line In");
+                snd_soc_dapm_disable_pin(dapm, "Headset Mic");
+                snd_soc_dapm_disable_pin(dapm, "Call Mic");
                 break;
         case NEO_GSM_CALL_AUDIO_HANDSET:
-                snd_soc_dapm_enable_pin(codec, "Audio Out");
-                snd_soc_dapm_enable_pin(codec, "GSM Line Out");
-                snd_soc_dapm_enable_pin(codec, "GSM Line In");
-                snd_soc_dapm_disable_pin(codec, "Headset Mic");
-                snd_soc_dapm_enable_pin(codec, "Call Mic");
+                snd_soc_dapm_enable_pin(dapm, "Audio Out");
+                snd_soc_dapm_enable_pin(dapm, "GSM Line Out");
+                snd_soc_dapm_enable_pin(dapm, "GSM Line In");
+                snd_soc_dapm_disable_pin(dapm, "Headset Mic");
+                snd_soc_dapm_enable_pin(dapm, "Call Mic");
                 break;
         case NEO_GSM_CALL_AUDIO_HEADSET:
-                snd_soc_dapm_enable_pin(codec, "Audio Out");
-                snd_soc_dapm_enable_pin(codec, "GSM Line Out");
-                snd_soc_dapm_enable_pin(codec, "GSM Line In");
-                snd_soc_dapm_enable_pin(codec, "Headset Mic");
-                snd_soc_dapm_disable_pin(codec, "Call Mic");
+                snd_soc_dapm_enable_pin(dapm, "Audio Out");
+                snd_soc_dapm_enable_pin(dapm, "GSM Line Out");
+                snd_soc_dapm_enable_pin(dapm, "GSM Line In");
+                snd_soc_dapm_enable_pin(dapm, "Headset Mic");
+                snd_soc_dapm_disable_pin(dapm, "Call Mic");
                 break;
         case NEO_GSM_CALL_AUDIO_BLUETOOTH:
-                snd_soc_dapm_disable_pin(codec, "Audio Out");
-                snd_soc_dapm_enable_pin(codec, "GSM Line Out");
-                snd_soc_dapm_enable_pin(codec, "GSM Line In");
-                snd_soc_dapm_disable_pin(codec, "Headset Mic");
-                snd_soc_dapm_disable_pin(codec, "Call Mic");
+                snd_soc_dapm_disable_pin(dapm, "Audio Out");
+                snd_soc_dapm_enable_pin(dapm, "GSM Line Out");
+                snd_soc_dapm_enable_pin(dapm, "GSM Line In");
+                snd_soc_dapm_disable_pin(dapm, "Headset Mic");
+                snd_soc_dapm_disable_pin(dapm, "Call Mic");
                 break;
         case NEO_STEREO_TO_SPEAKERS:
-                snd_soc_dapm_enable_pin(codec, "Audio Out");
-                snd_soc_dapm_disable_pin(codec, "GSM Line Out");
-                snd_soc_dapm_disable_pin(codec, "GSM Line In");
-                snd_soc_dapm_disable_pin(codec, "Headset Mic");
-                snd_soc_dapm_disable_pin(codec, "Call Mic");
+                snd_soc_dapm_enable_pin(dapm, "Audio Out");
+                snd_soc_dapm_disable_pin(dapm, "GSM Line Out");
+                snd_soc_dapm_disable_pin(dapm, "GSM Line In");
+                snd_soc_dapm_disable_pin(dapm, "Headset Mic");
+                snd_soc_dapm_disable_pin(dapm, "Call Mic");
                 break;
         case NEO_STEREO_TO_HEADPHONES:
-                snd_soc_dapm_enable_pin(codec, "Audio Out");
-                snd_soc_dapm_disable_pin(codec, "GSM Line Out");
-                snd_soc_dapm_disable_pin(codec, "GSM Line In");
-                snd_soc_dapm_disable_pin(codec, "Headset Mic");
-                snd_soc_dapm_disable_pin(codec, "Call Mic");
+                snd_soc_dapm_enable_pin(dapm, "Audio Out");
+                snd_soc_dapm_disable_pin(dapm, "GSM Line Out");
+                snd_soc_dapm_disable_pin(dapm, "GSM Line In");
+                snd_soc_dapm_disable_pin(dapm, "Headset Mic");
+                snd_soc_dapm_disable_pin(dapm, "Call Mic");
                 break;
         case NEO_CAPTURE_HANDSET:
-                snd_soc_dapm_disable_pin(codec, "Audio Out");
-                snd_soc_dapm_disable_pin(codec, "GSM Line Out");
-                snd_soc_dapm_disable_pin(codec, "GSM Line In");
-                snd_soc_dapm_disable_pin(codec, "Headset Mic");
-                snd_soc_dapm_enable_pin(codec, "Call Mic");
+                snd_soc_dapm_disable_pin(dapm, "Audio Out");
+                snd_soc_dapm_disable_pin(dapm, "GSM Line Out");
+                snd_soc_dapm_disable_pin(dapm, "GSM Line In");
+                snd_soc_dapm_disable_pin(dapm, "Headset Mic");
+                snd_soc_dapm_enable_pin(dapm, "Call Mic");
                 break;
         case NEO_CAPTURE_HEADSET:
-                snd_soc_dapm_disable_pin(codec, "Audio Out");
-                snd_soc_dapm_disable_pin(codec, "GSM Line Out");
-                snd_soc_dapm_disable_pin(codec, "GSM Line In");
-                snd_soc_dapm_enable_pin(codec, "Headset Mic");
-                snd_soc_dapm_disable_pin(codec, "Call Mic");
+                snd_soc_dapm_disable_pin(dapm, "Audio Out");
+                snd_soc_dapm_disable_pin(dapm, "GSM Line Out");
+                snd_soc_dapm_disable_pin(dapm, "GSM Line In");
+                snd_soc_dapm_enable_pin(dapm, "Headset Mic");
+                snd_soc_dapm_disable_pin(dapm, "Call Mic");
                 break;
         case NEO_CAPTURE_BLUETOOTH:
-                snd_soc_dapm_disable_pin(codec, "Audio Out");
-                snd_soc_dapm_disable_pin(codec, "GSM Line Out");
-                snd_soc_dapm_disable_pin(codec, "GSM Line In");
-                snd_soc_dapm_disable_pin(codec, "Headset Mic");
-                snd_soc_dapm_disable_pin(codec, "Call Mic");
+                snd_soc_dapm_disable_pin(dapm, "Audio Out");
+                snd_soc_dapm_disable_pin(dapm, "GSM Line Out");
+                snd_soc_dapm_disable_pin(dapm, "GSM Line In");
+                snd_soc_dapm_disable_pin(dapm, "Headset Mic");
+                snd_soc_dapm_disable_pin(dapm, "Call Mic");
                 break;
         default:
-                snd_soc_dapm_disable_pin(codec, "Audio Out");
-                snd_soc_dapm_disable_pin(codec, "GSM Line Out");
-                snd_soc_dapm_disable_pin(codec, "GSM Line In");
-                snd_soc_dapm_disable_pin(codec, "Headset Mic");
-                snd_soc_dapm_disable_pin(codec, "Call Mic");
+                snd_soc_dapm_disable_pin(dapm, "Audio Out");
+                snd_soc_dapm_disable_pin(dapm, "GSM Line Out");
+                snd_soc_dapm_disable_pin(dapm, "GSM Line In");
+                snd_soc_dapm_disable_pin(dapm, "Headset Mic");
+                snd_soc_dapm_disable_pin(dapm, "Call Mic");
         }
 
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
 
         return 0;
 }
@@ -502,20 +504,21 @@ static const struct snd_kcontrol_new wm8753_neo1973_controls[] = {
 static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err;
 
         pr_debug("Entered %s\n", __func__);
 
         /* set up NC codec pins */
-        snd_soc_dapm_nc_pin(codec, "LOUT2");
-        snd_soc_dapm_nc_pin(codec, "ROUT2");
-        snd_soc_dapm_nc_pin(codec, "OUT3");
-        snd_soc_dapm_nc_pin(codec, "OUT4");
-        snd_soc_dapm_nc_pin(codec, "LINE1");
-        snd_soc_dapm_nc_pin(codec, "LINE2");
+        snd_soc_dapm_nc_pin(dapm, "LOUT2");
+        snd_soc_dapm_nc_pin(dapm, "ROUT2");
+        snd_soc_dapm_nc_pin(dapm, "OUT3");
+        snd_soc_dapm_nc_pin(dapm, "OUT4");
+        snd_soc_dapm_nc_pin(dapm, "LINE1");
+        snd_soc_dapm_nc_pin(dapm, "LINE2");
 
         /* Add neo1973 specific widgets */
-        snd_soc_dapm_new_controls(codec, wm8753_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, wm8753_dapm_widgets,
                                   ARRAY_SIZE(wm8753_dapm_widgets));
 
         /* set endpoints to default mode */
@@ -528,10 +531,10 @@ static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd)
                 return err;
 
         /* set up neo1973 specific audio routes */
-        err = snd_soc_dapm_add_routes(codec, dapm_routes,
+        err = snd_soc_dapm_add_routes(dapm, dapm_routes,
                                       ARRAY_SIZE(dapm_routes));
 
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
         return 0;
 }
 
diff --git a/sound/soc/s3c24xx/rx1950_uda1380.c b/sound/soc/s3c24xx/rx1950_uda1380.c
index ffd5cf2fb0a9..105d177fa427 100644
--- a/sound/soc/s3c24xx/rx1950_uda1380.c
+++ b/sound/soc/s3c24xx/rx1950_uda1380.c
@@ -232,26 +232,27 @@ static int rx1950_hw_params(struct snd_pcm_substream *substream,
 static int rx1950_uda1380_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err;
 
         /* Add rx1950 specific widgets */
-        err = snd_soc_dapm_new_controls(codec, uda1380_dapm_widgets,
+        err = snd_soc_dapm_new_controls(dapm, uda1380_dapm_widgets,
                                   ARRAY_SIZE(uda1380_dapm_widgets));
 
         if (err)
                 return err;
 
         /* Set up rx1950 specific audio path audio_mapnects */
-        err = snd_soc_dapm_add_routes(codec, audio_map,
+        err = snd_soc_dapm_add_routes(dapm, audio_map,
                                       ARRAY_SIZE(audio_map));
 
         if (err)
                 return err;
 
-        snd_soc_dapm_enable_pin(codec, "Headphone Jack");
-        snd_soc_dapm_enable_pin(codec, "Speaker");
+        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
+        snd_soc_dapm_enable_pin(dapm, "Speaker");
 
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
 
         snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
                 &hp_jack);
diff --git a/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c b/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c
index f88453735ae2..05c793705d90 100644
--- a/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c
+++ b/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c
@@ -76,19 +76,20 @@ static const struct snd_soc_dapm_route base_map[] = {
 static int simtec_hermes_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
 
-        snd_soc_dapm_new_controls(codec, dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, dapm_widgets,
                                   ARRAY_SIZE(dapm_widgets));
 
-        snd_soc_dapm_add_routes(codec, base_map, ARRAY_SIZE(base_map));
+        snd_soc_dapm_add_routes(dapm, base_map, ARRAY_SIZE(base_map));
 
-        snd_soc_dapm_enable_pin(codec, "Headphone Jack");
-        snd_soc_dapm_enable_pin(codec, "Line In");
-        snd_soc_dapm_enable_pin(codec, "Line Out");
-        snd_soc_dapm_enable_pin(codec, "Mic Jack");
+        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
+        snd_soc_dapm_enable_pin(dapm, "Line In");
+        snd_soc_dapm_enable_pin(dapm, "Line Out");
+        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
 
         simtec_audio_init(rtd);
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
 
         return 0;
 }
diff --git a/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c b/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c
index c0967593510d..653dc7592e81 100644
--- a/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c
+++ b/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c
@@ -65,19 +65,20 @@ static const struct snd_soc_dapm_route base_map[] = {
 static int simtec_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
 
-        snd_soc_dapm_new_controls(codec, dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, dapm_widgets,
                                   ARRAY_SIZE(dapm_widgets));
 
-        snd_soc_dapm_add_routes(codec, base_map, ARRAY_SIZE(base_map));
+        snd_soc_dapm_add_routes(dapm, base_map, ARRAY_SIZE(base_map));
 
-        snd_soc_dapm_enable_pin(codec, "Headphone Jack");
-        snd_soc_dapm_enable_pin(codec, "Line In");
-        snd_soc_dapm_enable_pin(codec, "Line Out");
-        snd_soc_dapm_enable_pin(codec, "Mic Jack");
+        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
+        snd_soc_dapm_enable_pin(dapm, "Line In");
+        snd_soc_dapm_enable_pin(dapm, "Line Out");
+        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
 
         simtec_audio_init(rtd);
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
 
         return 0;
 }
diff --git a/sound/soc/s3c24xx/smartq_wm8987.c b/sound/soc/s3c24xx/smartq_wm8987.c
index dd20ca7f4681..1f6da1e27b1e 100644
--- a/sound/soc/s3c24xx/smartq_wm8987.c
+++ b/sound/soc/s3c24xx/smartq_wm8987.c
@@ -158,10 +158,11 @@ static const struct snd_soc_dapm_route audio_map[] = {
 
 static int smartq_wm8987_init(struct snd_soc_codec *codec)
 {
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err = 0;
 
         /* Add SmartQ specific widgets */
-        snd_soc_dapm_new_controls(codec, wm8987_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, wm8987_dapm_widgets,
                                   ARRAY_SIZE(wm8987_dapm_widgets));
 
         /* add SmartQ specific controls */
@@ -172,20 +173,20 @@ static int smartq_wm8987_init(struct snd_soc_codec *codec)
                 return err;
 
         /* setup SmartQ specific audio path */
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
         /* set endpoints to not connected */
-        snd_soc_dapm_nc_pin(codec, "LINPUT1");
-        snd_soc_dapm_nc_pin(codec, "RINPUT1");
-        snd_soc_dapm_nc_pin(codec, "OUT3");
-        snd_soc_dapm_nc_pin(codec, "ROUT1");
+        snd_soc_dapm_nc_pin(dapm, "LINPUT1");
+        snd_soc_dapm_nc_pin(dapm, "RINPUT1");
+        snd_soc_dapm_nc_pin(dapm, "OUT3");
+        snd_soc_dapm_nc_pin(dapm, "ROUT1");
 
         /* set endpoints to default off mode */
-        snd_soc_dapm_enable_pin(codec, "Internal Speaker");
-        snd_soc_dapm_enable_pin(codec, "Internal Mic");
-        snd_soc_dapm_disable_pin(codec, "Headphone Jack");
+        snd_soc_dapm_enable_pin(dapm, "Internal Speaker");
+        snd_soc_dapm_enable_pin(dapm, "Internal Mic");
+        snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
 
-        err = snd_soc_dapm_sync(codec);
+        err = snd_soc_dapm_sync(dapm);
         if (err)
                 return err;
 
diff --git a/sound/soc/s3c24xx/smdk64xx_wm8580.c b/sound/soc/s3c24xx/smdk64xx_wm8580.c
index 052e499b68d1..291939cf8483 100644
--- a/sound/soc/s3c24xx/smdk64xx_wm8580.c
+++ b/sound/soc/s3c24xx/smdk64xx_wm8580.c
@@ -182,21 +182,22 @@ static const struct snd_soc_dapm_route audio_map_rx[] = {
 static int smdk64xx_wm8580_init_paiftx(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
 
         /* Add smdk64xx specific Capture widgets */
-        snd_soc_dapm_new_controls(codec, wm8580_dapm_widgets_cpt,
+        snd_soc_dapm_new_controls(dapm, wm8580_dapm_widgets_cpt,
                                   ARRAY_SIZE(wm8580_dapm_widgets_cpt));
 
         /* Set up PAIFTX audio path */
-        snd_soc_dapm_add_routes(codec, audio_map_tx, ARRAY_SIZE(audio_map_tx));
+        snd_soc_dapm_add_routes(dapm, audio_map_tx, ARRAY_SIZE(audio_map_tx));
 
         /* Enabling the microphone requires the fitting of a 0R
          * resistor to connect the line from the microphone jack.
          */
-        snd_soc_dapm_disable_pin(codec, "MicIn");
+        snd_soc_dapm_disable_pin(dapm, "MicIn");
 
         /* signal a DAPM event */
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
 
         return 0;
 }
@@ -204,16 +205,17 @@ static int smdk64xx_wm8580_init_paiftx(struct snd_soc_pcm_runtime *rtd)
 static int smdk64xx_wm8580_init_paifrx(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
 
         /* Add smdk64xx specific Playback widgets */
-        snd_soc_dapm_new_controls(codec, wm8580_dapm_widgets_pbk,
+        snd_soc_dapm_new_controls(dapm, wm8580_dapm_widgets_pbk,
                                   ARRAY_SIZE(wm8580_dapm_widgets_pbk));
 
         /* Set up PAIFRX audio path */
-        snd_soc_dapm_add_routes(codec, audio_map_rx, ARRAY_SIZE(audio_map_rx));
+        snd_soc_dapm_add_routes(dapm, audio_map_rx, ARRAY_SIZE(audio_map_rx));
 
         /* signal a DAPM event */
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
 
         return 0;
 }