From a3e5c171d2efb328eff1644fe4dfc1ba15431e93 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sat, 8 Oct 2011 12:02:13 +0100 Subject: [PATCH] --- yaml --- r: 270835 b: refs/heads/master c: 35f0678ef7fc3a85d032bc870d1d11af6089e843 h: refs/heads/master i: 270833: 91b5d2fa4e9b7b5f7ad4347b36b313506789b100 270831: f5aef196cf7bbbb2640799c5141d8461644851c5 v: v3 --- [refs] | 2 +- trunk/sound/soc/samsung/goni_wm8994.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index cc57f1a0b40c..6fe2ce426377 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8cf149f3e1568da7ea9ec5148d18ed83ac530de +refs/heads/master: 35f0678ef7fc3a85d032bc870d1d11af6089e843 diff --git a/trunk/sound/soc/samsung/goni_wm8994.c b/trunk/sound/soc/samsung/goni_wm8994.c index 86ece1a97375..4a34f608e131 100644 --- a/trunk/sound/soc/samsung/goni_wm8994.c +++ b/trunk/sound/soc/samsung/goni_wm8994.c @@ -99,14 +99,6 @@ static int goni_wm8994_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_dapm_context *dapm = &codec->dapm; int ret; - /* add goni specific widgets */ - snd_soc_dapm_new_controls(dapm, goni_dapm_widgets, - ARRAY_SIZE(goni_dapm_widgets)); - - /* set up goni specific audio routes */ - snd_soc_dapm_add_routes(dapm, goni_dapm_routes, - ARRAY_SIZE(goni_dapm_routes)); - /* set endpoints to not connected */ snd_soc_dapm_nc_pin(dapm, "IN2LP:VXRN"); snd_soc_dapm_nc_pin(dapm, "IN2RP:VXRP"); @@ -253,6 +245,11 @@ static struct snd_soc_card goni = { .name = "goni", .dai_link = goni_dai, .num_links = ARRAY_SIZE(goni_dai), + + .dapm_widgets = goni_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(goni_dapm_widgets), + .dapm_routes = goni_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(goni_dapm_routes), }; static int __init goni_init(void)