ASoC: wm1133-ev1: Convert to table based DAPM setup

Use table based setup to register the DAPM widgets and routes.  This on one hand
makes the code a bit shorter and cleaner and on the other hand the board level
DAPM elements get registered in the card's DAPM context rather than in the
CODEC's DAPM context.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/fsl/wm1133-ev1.c b/sound/soc/fsl/wm1133-ev1.c
index fce63252bdbbfda7cc1d7d0cefa2295f26faf43d..804749a6c61e3241763eace3f935f95b978a0d17 100644 (file)
--- a/sound/soc/fsl/wm1133-ev1.c
+++ b/sound/soc/fsl/wm1133-ev1.c
@@ -214,12 +214,6 @@ static int wm1133_ev1_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, wm1133_ev1_widgets,
-                                 ARRAY_SIZE(wm1133_ev1_widgets));
-
-       snd_soc_dapm_add_routes(dapm, wm1133_ev1_map,
-                               ARRAY_SIZE(wm1133_ev1_map));
-
        /* Headphone jack detection */
        snd_soc_jack_new(codec, "Headphone", SND_JACK_HEADPHONE, &hp_jack);
        snd_soc_jack_add_pins(&hp_jack, ARRAY_SIZE(hp_jack_pins),
@@ -257,6 +251,11 @@ static struct snd_soc_card wm1133_ev1 = {
        .owner = THIS_MODULE,
        .dai_link = &wm1133_ev1_dai,
        .num_links = 1,
+
+       .dapm_widgets = wm1133_ev1_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(wm1133_ev1_widgets),
+       .dapm_routes = wm1133_ev1_map,
+       .num_dapm_routes = ARRAY_SIZE(wm1133_ev1_map),
 };
 
 static struct platform_device *wm1133_ev1_snd_device;