diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-08 12:02:13 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-11 14:30:19 +0100 |
| commit | 35f0678ef7fc3a85d032bc870d1d11af6089e843 (patch) | |
| tree | 2a73202711a49513a815533632e57f399080d1a2 /sound | |
| parent | f8cf149f3e1568da7ea9ec5148d18ed83ac530de (diff) | |
| download | op-kernel-dev-35f0678ef7fc3a85d032bc870d1d11af6089e843.zip op-kernel-dev-35f0678ef7fc3a85d032bc870d1d11af6089e843.tar.gz | |
ASoC: Convert Goni to data based DAPM init
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/samsung/goni_wm8994.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c index 86ece1a..4a34f60 100644 --- a/sound/soc/samsung/goni_wm8994.c +++ b/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) |
