ALSA: ASoC: Convert playpaq_wm8510 to bulk route registration API

[linux-2.6.git] / sound / soc / at32 / playpaq_wm8510.c

diff --git a/sound/soc/at32/playpaq_wm8510.c b/sound/soc/at32/playpaq_wm8510.c
index 98a2d5826a85649e9efda2ee236a6371276317e2..b1966e4dfcd3e7b2035c15f47b5842d2438d253e 100644 (file)
--- a/sound/soc/at32/playpaq_wm8510.c
+++ b/sound/soc/at32/playpaq_wm8510.c
@@ -304,7 +304,7 @@ static const struct snd_soc_dapm_widget playpaq_dapm_widgets[] = {
 
 
 
-static const char *intercon[][3] = {
+static const struct snd_soc_dapm_route intercon[] = {
        /* speaker connected to SPKOUT */
        {"Ext Spk", NULL, "SPKOUTP"},
        {"Ext Spk", NULL, "SPKOUTN"},
@@ -312,9 +312,6 @@ static const char *intercon[][3] = {
        {"Mic Bias", NULL, "Int Mic"},
        {"MICN", NULL, "Mic Bias"},
        {"MICP", NULL, "Mic Bias"},
-
-       /* Terminator */
-       {NULL, NULL, NULL},
 };
 
 
@@ -334,11 +331,8 @@ static int playpaq_wm8510_init(struct snd_soc_codec *codec)
        /*
         * Setup audio path interconnects
         */
-       for (i = 0; intercon[i][0] != NULL; i++) {
-               snd_soc_dapm_connect_input(codec,
-                                          intercon[i][0],
-                                          intercon[i][1], intercon[i][2]);
-       }
+       snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
+
 
 
        /* always connected pins */