1 files changed, 4 insertions, 11 deletions

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 957996e0eba2..cb8365ac0c02 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -497,7 +497,7 @@ static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = {
         SND_SOC_DAPM_INPUT("LINE2R"),
 };
 
-static const char *intercon[][3] = {
+static const struct snd_soc_dapm_route intercon[] = {
         /* Left Output */
         {"Left DAC Mux", "DAC_L1", "Left DAC"},
         {"Left DAC Mux", "DAC_L2", "Left DAC"},
@@ -641,22 +641,15 @@ static const char *intercon[][3] = {
         {"Right Line Out", NULL, "Right Line2 Bypass Mixer"},
         {"Mono Out", NULL, "Right Line2 Bypass Mixer"},
         {"Right HP Out", NULL, "Right Line2 Bypass Mixer"},
-
-        /* terminator */
-        {NULL, NULL, NULL},
 };
 
 static int aic3x_add_widgets(struct snd_soc_codec *codec)
 {
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(aic3x_dapm_widgets); i++)
-                snd_soc_dapm_new_control(codec, &aic3x_dapm_widgets[i]);
+        snd_soc_dapm_new_controls(codec, aic3x_dapm_widgets,
+                                  ARRAY_SIZE(aic3x_dapm_widgets));
 
         /* set up 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));
 
         snd_soc_dapm_new_widgets(codec);
         return 0;