From e44e75d9e29ca213cdedc0ab3a25e36a61a89597 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sat, 8 Oct 2011 13:30:55 +0100
Subject: [PATCH] --- yaml --- r: 270823 b: refs/heads/master c:
 257fe5930dadc69e7da3e16a310e7fa22fbecdcf h: refs/heads/master i:   270821:
 caccb80b8cb0be8912519817316821fdb9a2a065   270819:
 e0996d2229bd9f04d1ecc2a1e95b7c427fdda049   270815:
 17bc747e9138f837b2b521859619f0ab878b04d2 v: v3

---
 [refs]                                  |  2 +-
 trunk/sound/soc/samsung/smartq_wm8987.c | 21 +++++++--------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 8ec3ea944006..49faa7e2a114 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ae232299e0cc87671e27bd4446acee32c3ccc1d
+refs/heads/master: 257fe5930dadc69e7da3e16a310e7fa22fbecdcf
diff --git a/trunk/sound/soc/samsung/smartq_wm8987.c b/trunk/sound/soc/samsung/smartq_wm8987.c
index 6db4e554ea03..6ac6bc2bcc4e 100644
--- a/trunk/sound/soc/samsung/smartq_wm8987.c
+++ b/trunk/sound/soc/samsung/smartq_wm8987.c
@@ -153,20 +153,6 @@ static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd)
 	struct snd_soc_dapm_context *dapm = &codec->dapm;
 	int err = 0;
 
-	/* Add SmartQ specific widgets */
-	snd_soc_dapm_new_controls(dapm, wm8987_dapm_widgets,
-				  ARRAY_SIZE(wm8987_dapm_widgets));
-
-	/* add SmartQ specific controls */
-	err = snd_soc_add_controls(codec, wm8987_smartq_controls,
-				   ARRAY_SIZE(wm8987_smartq_controls));
-
-	if (err < 0)
-		return err;
-
-	/* setup SmartQ specific audio path */
-	snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
 	/* set endpoints to not connected */
 	snd_soc_dapm_nc_pin(dapm, "LINPUT1");
 	snd_soc_dapm_nc_pin(dapm, "RINPUT1");
@@ -213,6 +199,13 @@ static struct snd_soc_card snd_soc_smartq = {
 	.name = "SmartQ",
 	.dai_link = smartq_dai,
 	.num_links = ARRAY_SIZE(smartq_dai),
+
+	.dapm_widgets = wm8987_dapm_widgets,
+	.num_dapm_widgets = ARRAY_SIZE(wm8987_dapm_widgets),
+	.dapm_routes = audio_map,
+	.num_dapm_routes = ARRAY_SIZE(audio_map),
+	.controls = wm8987_smartq_controls,
+	.num_controls = ARRAY_SIZE(wm8987_smartq_controls),
 };
 
 static struct platform_device *smartq_snd_device;