lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: Convert Jive to table based init

Browse Source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>
This commit is contained in:
Mark Brown
2011-10-08 13:30:17 +01:00
parent ce363f6d34
commit 03b5362d2f
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sound/soc/samsung/jive_wm8750.c
View File

@@ -110,17 +110,6 @@ static int jive_wm8750_init(struct snd_soc_pcm_runtime *rtd)
snd_soc_dapm_nc_pin(dapm, "OUT3"); snd_soc_dapm_nc_pin(dapm, "OUT3");
snd_soc_dapm_nc_pin(dapm, "MONO"); snd_soc_dapm_nc_pin(dapm, "MONO");
/* Add jive specific widgets */
err = snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets,
ARRAY_SIZE(wm8750_dapm_widgets));
if (err) {
printk(KERN_ERR "%s: failed to add widgets (%d)\n",
__func__, err);
return err;
}
snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
return 0; return 0;
} }
@@ -140,6 +129,11 @@ static struct snd_soc_card snd_soc_machine_jive = {
.name = "Jive", .name = "Jive",
.dai_link = &jive_dai, .dai_link = &jive_dai,
.num_links = 1, .num_links = 1,
.dapm_widgtets = wm8750_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(wm8750_dapm_widgets),
.dapm_routes = audio_map,
.num_dapm_routes = ARRAY_SIZE(audio_map),
}; };
static struct platform_device *jive_snd_device; static struct platform_device *jive_snd_device;