10 files changed, 28 insertions, 76 deletions

diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index 9d9c8ad57f0e..5a88136aa800 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -101,14 +101,9 @@ static void corgi_ext_control(struct snd_soc_dapm_context *dapm)
 static int corgi_startup(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_codec *codec = rtd->codec;
-
-        mutex_lock(&codec->mutex);
 
         /* check the jack status at stream startup */
-        corgi_ext_control(&codec->dapm);
-
-        mutex_unlock(&codec->mutex);
+        corgi_ext_control(&rtd->card->dapm);
 
         return 0;
 }
diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c
index 44b5c09d296b..c29fedab2f49 100644
--- a/sound/soc/pxa/e740_wm9705.c
+++ b/sound/soc/pxa/e740_wm9705.c
@@ -103,11 +103,6 @@ static int e740_ac97_init(struct snd_soc_pcm_runtime *rtd)
         snd_soc_dapm_nc_pin(dapm, "PCBEEP");
         snd_soc_dapm_nc_pin(dapm, "MIC2");
 
-        snd_soc_dapm_new_controls(dapm, e740_dapm_widgets,
-                                        ARRAY_SIZE(e740_dapm_widgets));
-
-        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
         return 0;
 }
 
@@ -136,6 +131,11 @@ static struct snd_soc_card e740 = {
         .owner = THIS_MODULE,
         .dai_link = e740_dai,
         .num_links = ARRAY_SIZE(e740_dai),
+
+        .dapm_widgets = e740_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(e740_dapm_widgets),
+        .dapm_routes = audio_map,
+        .num_dapm_routes = ARRAY_SIZE(audio_map),
 };
 
 static struct gpio e740_audio_gpios[] = {
diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c
index c34e447eb991..ee36aba88063 100644
--- a/sound/soc/pxa/e750_wm9705.c
+++ b/sound/soc/pxa/e750_wm9705.c
@@ -85,11 +85,6 @@ static int e750_ac97_init(struct snd_soc_pcm_runtime *rtd)
         snd_soc_dapm_nc_pin(dapm, "PCBEEP");
         snd_soc_dapm_nc_pin(dapm, "MIC2");
 
-        snd_soc_dapm_new_controls(dapm, e750_dapm_widgets,
-                                        ARRAY_SIZE(e750_dapm_widgets));
-
-        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
         return 0;
 }
 
@@ -119,6 +114,11 @@ static struct snd_soc_card e750 = {
         .owner = THIS_MODULE,
         .dai_link = e750_dai,
         .num_links = ARRAY_SIZE(e750_dai),
+
+        .dapm_widgets = e750_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(e750_dapm_widgets),
+        .dapm_routes = audio_map,
+        .num_dapm_routes = ARRAY_SIZE(audio_map),
 };
 
 static struct gpio e750_audio_gpios[] = {
diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c
index 3137f800b43f..24c2078ce70b 100644
--- a/sound/soc/pxa/e800_wm9712.c
+++ b/sound/soc/pxa/e800_wm9712.c
@@ -71,19 +71,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
         {"MIC2", NULL, "Mic (Internal2)"},
 };
 
-static int e800_ac97_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(dapm, e800_dapm_widgets,
-                                        ARRAY_SIZE(e800_dapm_widgets));
-
-        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
-        return 0;
-}
-
 static struct snd_soc_dai_link e800_dai[] = {
         {
                 .name = "AC97",
@@ -92,7 +79,6 @@ static struct snd_soc_dai_link e800_dai[] = {
                 .codec_dai_name = "wm9712-hifi",
                 .platform_name = "pxa-pcm-audio",
                 .codec_name = "wm9712-codec",
-                .init = e800_ac97_init,
         },
         {
                 .name = "AC97 Aux",
@@ -109,6 +95,11 @@ static struct snd_soc_card e800 = {
         .owner = THIS_MODULE,
         .dai_link = e800_dai,
         .num_links = ARRAY_SIZE(e800_dai),
+
+        .dapm_widgets = e800_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(e800_dapm_widgets),
+        .dapm_routes = audio_map,
+        .num_dapm_routes = ARRAY_SIZE(audio_map),
 };
 
 static struct gpio e800_audio_gpios[] = {
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index 31242be08823..41ab6678b65d 100644
--- a/sound/soc/pxa/magician.c
+++ b/sound/soc/pxa/magician.c
@@ -77,13 +77,9 @@ static int magician_startup(struct snd_pcm_substream *substream)
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_codec *codec = rtd->codec;
 
-        mutex_lock(&codec->mutex);
-
         /* check the jack status at stream startup */
         magician_ext_control(codec);
 
-        mutex_unlock(&codec->mutex);
-
         return 0;
 }
 
diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c
index 160c5245448f..595eee341e90 100644
--- a/sound/soc/pxa/mioa701_wm9713.c
+++ b/sound/soc/pxa/mioa701_wm9713.c
@@ -127,16 +127,8 @@ static const struct snd_soc_dapm_route audio_map[] = {
 static int mioa701_wm9713_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
         unsigned short reg;
 
-        /* Add mioa701 specific widgets */
-        snd_soc_dapm_new_controls(dapm, mioa701_dapm_widgets,
-                                  ARRAY_SIZE(mioa701_dapm_widgets));
-
-        /* Set up mioa701 specific audio path audio_mapnects */
-        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
         /* Prepare GPIO8 for rear speaker amplifier */
         reg = codec->driver->read(codec, AC97_GPIO_CFG);
         codec->driver->write(codec, AC97_GPIO_CFG, reg | 0x0100);
@@ -145,12 +137,6 @@ static int mioa701_wm9713_init(struct snd_soc_pcm_runtime *rtd)
         reg = codec->driver->read(codec, AC97_3D_CONTROL);
         codec->driver->write(codec, AC97_3D_CONTROL, reg | 0xc000);
 
-        snd_soc_dapm_enable_pin(dapm, "Front Speaker");
-        snd_soc_dapm_enable_pin(dapm, "Rear Speaker");
-        snd_soc_dapm_enable_pin(dapm, "Front Mic");
-        snd_soc_dapm_enable_pin(dapm, "GSM Line In");
-        snd_soc_dapm_enable_pin(dapm, "GSM Line Out");
-
         return 0;
 }
 
@@ -183,6 +169,11 @@ static struct snd_soc_card mioa701 = {
         .owner = THIS_MODULE,
         .dai_link = mioa701_dai,
         .num_links = ARRAY_SIZE(mioa701_dai),
+
+        .dapm_widgets = mioa701_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(mioa701_dapm_widgets),
+        .dapm_routes = audio_map,
+        .num_dapm_routes = ARRAY_SIZE(audio_map),
 };
 
 static int mioa701_wm9713_probe(struct platform_device *pdev)
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index c93e138d8dc3..c6bdc6c0eff6 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -74,14 +74,9 @@ static void poodle_ext_control(struct snd_soc_dapm_context *dapm)
 static int poodle_startup(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_codec *codec = rtd->codec;
-
-        mutex_lock(&codec->mutex);
 
         /* check the jack status at stream startup */
-        poodle_ext_control(&codec->dapm);
-
-        mutex_unlock(&codec->mutex);
+        poodle_ext_control(&rtd->card->dapm);
 
         return 0;
 }
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index 04dbb5a38fa4..1373b017a951 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -111,14 +111,9 @@ static void spitz_ext_control(struct snd_soc_dapm_context *dapm)
 static int spitz_startup(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_codec *codec = rtd->codec;
-
-        mutex_lock(&codec->mutex);
 
         /* check the jack status at stream startup */
-        spitz_ext_control(&codec->dapm);
-
-        mutex_unlock(&codec->mutex);
+        spitz_ext_control(&rtd->card->dapm);
 
         return 0;
 }
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index 2a4b438ce97c..cead1658d10a 100644
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -84,13 +84,9 @@ static int tosa_startup(struct snd_pcm_substream *substream)
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_codec *codec = rtd->codec;
 
-        mutex_lock(&codec->mutex);
-
         /* check the jack status at stream startup */
         tosa_ext_control(codec);
 
-        mutex_unlock(&codec->mutex);
-
         return 0;
 }
 
diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c
index db8aadf8932d..23bf991e95d5 100644
--- a/sound/soc/pxa/zylonite.c
+++ b/sound/soc/pxa/zylonite.c
@@ -71,22 +71,10 @@ static const struct snd_soc_dapm_route audio_map[] = {
 
 static int zylonite_wm9713_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
         if (clk_pout)
                 snd_soc_dai_set_pll(rtd->codec_dai, 0, 0,
                                     clk_get_rate(pout), 0);
 
-        snd_soc_dapm_new_controls(dapm, zylonite_dapm_widgets,
-                                  ARRAY_SIZE(zylonite_dapm_widgets));
-
-        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
-        /* Static setup for now */
-        snd_soc_dapm_enable_pin(dapm, "Headphone");
-        snd_soc_dapm_enable_pin(dapm, "Headset Earpiece");
-
         return 0;
 }
 
@@ -256,6 +244,11 @@ static struct snd_soc_card zylonite = {
         .resume_pre = &zylonite_resume_pre,
         .dai_link = zylonite_dai,
         .num_links = ARRAY_SIZE(zylonite_dai),
+
+        .dapm_widgets = zylonite_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(zylonite_dapm_widgets),
+        .dapm_routes = audio_map,
+        .num_dapm_routes = ARRAY_SIZE(audio_map),
 };
 
 static struct platform_device *zylonite_snd_ac97_device;