ASoC: Convert Goni to data based DAPM init

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>

diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c
index 86ece1a973756aa03b284b846973899475d30d49..4a34f608e131127aa73a27618e6c5870d60c1e7e 100644 (file)
--- a/sound/soc/samsung/goni_wm8994.c
+++ b/sound/soc/samsung/goni_wm8994.c
@@ -99,14 +99,6 @@ static int goni_wm8994_init(struct snd_soc_pcm_runtime *rtd)
        struct snd_soc_dapm_context *dapm = &codec->dapm;
        int ret;
 
-       /* add goni specific 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(dapm, goni_dapm_routes,
-                       ARRAY_SIZE(goni_dapm_routes));
-
        /* set endpoints to not connected */
        snd_soc_dapm_nc_pin(dapm, "IN2LP:VXRN");
        snd_soc_dapm_nc_pin(dapm, "IN2RP:VXRP");
@@ -253,6 +245,11 @@ static struct snd_soc_card goni = {
        .name = "goni",
        .dai_link = goni_dai,
        .num_links = ARRAY_SIZE(goni_dai),
+
+       .dapm_widgets = goni_dapm_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(goni_dapm_widgets),
+       .dapm_routes = goni_dapm_routes,
+       .num_dapm_routes = ARRAY_SIZE(goni_dapm_routes),
 };
 
 static int __init goni_init(void)