Skip to content

Commit

Permalink
ASoC: Convert Jive to table based init
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>
  • Loading branch information
Mark Brown committed Oct 10, 2011
1 parent ce363f6 commit 03b5362
Showing 1 changed file with 5 additions and 11 deletions.
16 changes: 5 additions & 11 deletions sound/soc/samsung/jive_wm8750.c
Original file line number Diff line number Diff line change
Expand Up @@ -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, "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;
}

Expand All @@ -140,6 +129,11 @@ static struct snd_soc_card snd_soc_machine_jive = {
.name = "Jive",
.dai_link = &jive_dai,
.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;
Expand Down

0 comments on commit 03b5362

Please sign in to comment.