From bd24ee37cda343db7f02f9b7caac84a7b439282e Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 13 May 2008 14:58:03 +0200
Subject: [PATCH] --- yaml --- r: 99039 b: refs/heads/master c:
 8f3112d7a847c2933a42ce29f17899f585d09106 h: refs/heads/master i:   99037:
 30153efe9a3eea499376f8c8d771804282a68633   99035:
 3dd0c7bc1c858700e2b9f47dd4406b13fc9c7124   99031:
 ba3b692299344db298cc644387976e2616a96e74   99023:
 ee2f0ad29fae793678c9008a6ef241afcf238100   99007:
 da6f5cb249ac6f96dd5d1ae732a45dcd9f3038dd v: v3

---
 [refs]                                   |  2 +-
 trunk/sound/soc/s3c24xx/neo1973_wm8753.c | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index ae1f35072312..24f86a44b081 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51e6a8411a9440f0fdba6cdd7d779e74f89debc4
+refs/heads/master: 8f3112d7a847c2933a42ce29f17899f585d09106
diff --git a/trunk/sound/soc/s3c24xx/neo1973_wm8753.c b/trunk/sound/soc/s3c24xx/neo1973_wm8753.c
index e469186a407d..79c5027273cb 100644
--- a/trunk/sound/soc/s3c24xx/neo1973_wm8753.c
+++ b/trunk/sound/soc/s3c24xx/neo1973_wm8753.c
@@ -425,8 +425,7 @@ static const struct snd_soc_dapm_widget wm8753_dapm_widgets[] = {
 };
 
 
-/* example machine audio_mapnections */
-static const char *audio_map[][3] = {
+static const struct snd_soc_dapm_route dapm_routes[] = {
 
 	/* Connections to the lm4857 amp */
 	{"Audio Out", NULL, "LOUT1"},
@@ -449,8 +448,6 @@ static const char *audio_map[][3] = {
 
 	/* Connect the ALC pins */
 	{"ACIN", NULL, "ACOP"},
-
-	{NULL, NULL, NULL},
 };
 
 static const char *lm4857_mode[] = {
@@ -526,8 +523,8 @@ static int neo1973_wm8753_init(struct snd_soc_codec *codec)
 	set_scenario_endpoints(codec, NEO_AUDIO_OFF);
 
 	/* Add neo1973 specific widgets */
-	for (i = 0; i < ARRAY_SIZE(wm8753_dapm_widgets); i++)
-		snd_soc_dapm_new_control(codec, &wm8753_dapm_widgets[i]);
+	snd_soc_dapm_new_controls(codec, wm8753_dapm_widgets,
+				  ARRAY_SIZE(wm8753_dapm_widgets));
 
 	/* add neo1973 specific controls */
 	for (i = 0; i < ARRAY_SIZE(wm8753_neo1973_controls); i++) {
@@ -538,11 +535,9 @@ static int neo1973_wm8753_init(struct snd_soc_codec *codec)
 			return err;
 	}
 
-	/* set up neo1973 specific audio path audio_mapnects */
-	for (i = 0; audio_map[i][0] != NULL; i++) {
-		snd_soc_dapm_connect_input(codec, audio_map[i][0],
-			audio_map[i][1], audio_map[i][2]);
-	}
+	/* set up neo1973 specific audio routes */
+	err = snd_soc_dapm_add_routes(codec, dapm_routes,
+				      ARRAY_SIZE(dapm_routes));
 
 	snd_soc_dapm_sync_endpoints(codec);
 	return 0;