ASoC: sdp3430: Let core to deal with the DAPM widgets

Pass the DAPM widgets/routes via the snd_soc_card struct
to core.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Misael Lopez Cruz <misael.lopez@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c
index 85e2e9183e2116beaa758df3ce793a8320e34265..4f1969de91a70aa80ea87f7d918d53f574ac2ecf 100644 (file)
--- a/sound/soc/omap/sdp3430.c
+++ b/sound/soc/omap/sdp3430.c
@@ -129,15 +129,6 @@ static int sdp3430_twl4030_init(struct snd_soc_pcm_runtime *rtd)
        struct snd_soc_dapm_context *dapm = &codec->dapm;
        int ret;
 
-       /* Add SDP3430 specific widgets */
-       ret = snd_soc_dapm_new_controls(dapm, sdp3430_twl4030_dapm_widgets,
-                               ARRAY_SIZE(sdp3430_twl4030_dapm_widgets));
-       if (ret)
-               return ret;
-
-       /* Set up SDP3430 specific audio path audio_map */
-       snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
        /* SDP3430 connected pins */
        snd_soc_dapm_enable_pin(dapm, "Ext Mic");
        snd_soc_dapm_enable_pin(dapm, "Ext Spk");
@@ -223,6 +214,11 @@ static struct snd_soc_card snd_soc_sdp3430 = {
        .name = "SDP3430",
        .dai_link = sdp3430_dai,
        .num_links = ARRAY_SIZE(sdp3430_dai),
+
+       .dapm_widgets = sdp3430_twl4030_dapm_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(sdp3430_twl4030_dapm_widgets),
+       .dapm_routes = audio_map,
+       .num_dapm_routes = ARRAY_SIZE(audio_map),
 };
 
 static struct platform_device *sdp3430_snd_device;