ASoC: Convert Jive to table based init
Mark Brown [Sat, 8 Oct 2011 12:30:17 +0000 (13:30 +0100)]
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>

sound/soc/samsung/jive_wm8750.c

index bb69e9f..f5f7c6f 100644 (file)
@@ -110,17 +110,6 @@ static int jive_wm8750_init(struct snd_soc_pcm_runtime *rtd)
        snd_soc_dapm_nc_pin(dapm, "OUT3");
        snd_soc_dapm_nc_pin(dapm, "MONO");
 
-       /* Add jive specific widgets */
-       err = snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets,
-                                       ARRAY_SIZE(wm8750_dapm_widgets));
-       if (err) {
-               printk(KERN_ERR "%s: failed to add widgets (%d)\n",
-                      __func__, err);
-               return err;
-       }
-
-       snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
        return 0;
 }
 
@@ -140,6 +129,11 @@ static struct snd_soc_card snd_soc_machine_jive = {
        .name           = "Jive",
        .dai_link       = &jive_dai,
        .num_links      = 1,
+
+       .dapm_widgtets  = wm8750_dapm_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(wm8750_dapm_widgets),
+       .dapm_routes    = audio_map,
+       .num_dapm_routes = ARRAY_SIZE(audio_map),
 };
 
 static struct platform_device *jive_snd_device;