ASoC: Convert saarb to table based DAPM init

Also remove a unused ret variable to silence the build warning.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/sound/soc/pxa/saarb.c b/sound/soc/pxa/saarb.c
index b2be225b1463..c34146b776b4 100644
--- a/sound/soc/pxa/saarb.c
+++ b/sound/soc/pxa/saarb.c
@@ -51,7 +51,7 @@ static const struct snd_soc_dapm_widget saarb_dapm_widgets[] = {
 };
 
 /* saarb machine audio map */
-static const struct snd_soc_dapm_route audio_map[] = {
+static const struct snd_soc_dapm_route saarb_audio_map[] = {
         {"Headset Stereophone", NULL, "HS1"},
         {"Headset Stereophone", NULL, "HS2"},
 
@@ -121,17 +121,17 @@ static struct snd_soc_card snd_soc_card_saarb = {
         .owner = THIS_MODULE,
         .dai_link = saarb_dai,
         .num_links = ARRAY_SIZE(saarb_dai),
+
+        .dapm_widgets = saarb_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(saarb_dapm_widgets),
+        .dapm_routes = saarb_audio_map,
+        .num_dapm_routes = ARRAY_SIZE(saarb_audio_map),
 };
 
 static int saarb_pm860x_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
         struct snd_soc_dapm_context *dapm = &codec->dapm;
-        int ret;
-
-        snd_soc_dapm_new_controls(dapm, saarb_dapm_widgets,
-                                  ARRAY_SIZE(saarb_dapm_widgets));
-        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
         /* connected pins */
         snd_soc_dapm_enable_pin(dapm, "Ext Speaker");