diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-12-31 08:45:01 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-02 13:08:37 +0000 |
| commit | 1a2dbcbe0491bdfd4fc2484a9853a019f9e21a9c (patch) | |
| tree | da1d21b6ce93362ac13aa5533f9028b2fe756f50 /sound/soc | |
| parent | 7c27426356c185ac9f8af8c77889b51d1442a2ac (diff) | |
| download | linux-1a2dbcbe0491bdfd4fc2484a9853a019f9e21a9c.tar.gz linux-1a2dbcbe0491bdfd4fc2484a9853a019f9e21a9c.tar.bz2 linux-1a2dbcbe0491bdfd4fc2484a9853a019f9e21a9c.zip | |
ASoC: Convert tavorevb3 to table based DAPM init
Also remove a unsued ret variable to silence the build warning.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/pxa/tavorevb3.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/pxa/tavorevb3.c b/sound/soc/pxa/tavorevb3.c index 4bef12cd424d..56ee82f61189 100644 --- a/sound/soc/pxa/tavorevb3.c +++ b/sound/soc/pxa/tavorevb3.c @@ -51,7 +51,7 @@ static const struct snd_soc_dapm_widget evb3_dapm_widgets[] = { }; /* tavorevb3 machine audio map */ -static const struct snd_soc_dapm_route audio_map[] = { +static const struct snd_soc_dapm_route evb3_audio_map[] = { {"Headset Stereophone", NULL, "HS1"}, {"Headset Stereophone", NULL, "HS2"}, @@ -128,17 +128,17 @@ static struct snd_soc_card snd_soc_card_evb3 = { .owner = THIS_MODULE, .dai_link = evb3_dai, .num_links = ARRAY_SIZE(evb3_dai), + + .dapm_widgets = evb3_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(evb3_dapm_widgets), + .dapm_routes = evb3_audio_map, + .num_dapm_routes = ARRAY_SIZE(evb3_audio_map), }; static int evb3_pm860x_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_codec *codec = rtd->codec; struct snd_soc_dapm_context *dapm = &codec->dapm; - int ret; - - snd_soc_dapm_new_controls(dapm, evb3_dapm_widgets, - ARRAY_SIZE(evb3_dapm_widgets)); - snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); /* connected pins */ snd_soc_dapm_enable_pin(dapm, "Ext Speaker"); |