Skip to content

Commit

Permalink
ASoC: Convert H1940 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 4f5448a commit 6119d01
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions sound/soc/samsung/h1940_uda1380.c
Original file line number Diff line number Diff line change
Expand Up @@ -182,18 +182,6 @@ static int h1940_uda1380_init(struct snd_soc_pcm_runtime *rtd)
struct snd_soc_dapm_context *dapm = &codec->dapm;
int err;

/* Add h1940 specific widgets */
err = snd_soc_dapm_new_controls(dapm, uda1380_dapm_widgets,
ARRAY_SIZE(uda1380_dapm_widgets));
if (err)
return err;

/* Set up h1940 specific audio path audio_mapnects */
err = snd_soc_dapm_add_routes(dapm, audio_map,
ARRAY_SIZE(audio_map));
if (err)
return err;

snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
snd_soc_dapm_enable_pin(dapm, "Speaker");
snd_soc_dapm_enable_pin(dapm, "Mic Jack");
Expand Down Expand Up @@ -228,6 +216,11 @@ static struct snd_soc_card h1940_asoc = {
.name = "h1940",
.dai_link = h1940_uda1380_dai,
.num_links = ARRAY_SIZE(h1940_uda1380_dai),

.dapm_widgets = uda1380_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(uda1380_dapm_widgets),
.dapm_routes = audio_map,
.num_dapm_routes = ARRAY_SIZE(audio_map),
};

static int __init h1940_init(void)
Expand Down

0 comments on commit 6119d01

Please sign in to comment.