ASoC: zoom2: No need to call dapm_pin_enable at init time

[mv-sheeva.git] / sound / soc / omap / zoom2.c

diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c
index 8b1ebbce33aa36dc1a3f51282129cfecd1508b50..7cf35c82368ad6548ba1104afd5aca4afe5cb2b0 100644 (file)
--- a/sound/soc/omap/zoom2.c
+++ b/sound/soc/omap/zoom2.c
@@ -98,23 +98,6 @@ static int zoom2_twl4030_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 Zoom2 specific widgets */
-       ret = snd_soc_dapm_new_controls(dapm, zoom2_twl4030_dapm_widgets,
-                               ARRAY_SIZE(zoom2_twl4030_dapm_widgets));
-       if (ret)
-               return ret;
-
-       /* Set up Zoom2 specific audio path audio_map */
-       snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
-       /* Zoom2 connected pins */
-       snd_soc_dapm_enable_pin(dapm, "Ext Mic");
-       snd_soc_dapm_enable_pin(dapm, "Ext Spk");
-       snd_soc_dapm_enable_pin(dapm, "Headset Mic");
-       snd_soc_dapm_enable_pin(dapm, "Headset Stereophone");
-       snd_soc_dapm_enable_pin(dapm, "Aux In");
 
        /* TWL4030 not connected pins */
        snd_soc_dapm_nc_pin(dapm, "CARKITMIC");
@@ -126,9 +109,7 @@ static int zoom2_twl4030_init(struct snd_soc_pcm_runtime *rtd)
        snd_soc_dapm_nc_pin(dapm, "CARKITL");
        snd_soc_dapm_nc_pin(dapm, "CARKITR");
 
-       ret = snd_soc_dapm_sync(dapm);
-
-       return ret;
+       return 0;
 }
 
 static int zoom2_twl4030_voice_init(struct snd_soc_pcm_runtime *rtd)
@@ -177,6 +158,11 @@ static struct snd_soc_card snd_soc_zoom2 = {
        .name = "Zoom2",
        .dai_link = zoom2_dai,
        .num_links = ARRAY_SIZE(zoom2_dai),
+
+       .dapm_widgets = zoom2_twl4030_dapm_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(zoom2_twl4030_dapm_widgets),
+       .dapm_routes = audio_map,
+       .num_dapm_routes = ARRAY_SIZE(audio_map),
 };
 
 static struct platform_device *zoom2_snd_device;