diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-03-01 15:48:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-03 03:01:48 +0100 |
| commit | 23d8f2253c5ebe975465a61dd416a35b5ebda4b0 (patch) | |
| tree | 7ea340e6583045450354c9627b001b581efa628c /sound/soc/pxa/e740_wm9705.c | |
| parent | ASoC: pxa: Pass correct DAPM context to {corgi,poodle,spitz}_ext_control (diff) | |
| download | linux-23d8f2253c5ebe975465a61dd416a35b5ebda4b0.tar.xz linux-23d8f2253c5ebe975465a61dd416a35b5ebda4b0.zip | |
ASoC: pxa: e740_wm9705: Convert to table based DAPM setup
Use table based setup to register the DAPM widgets and routes. This on one hand
makes the code a bit cleaner and on the other hand the board level DAPM elements
get registered in the card's DAPM context rather than in the CODEC's DAPM
context.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/pxa/e740_wm9705.c')
| -rw-r--r-- | sound/soc/pxa/e740_wm9705.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c index 44b5c09d296b..c29fedab2f49 100644 --- a/sound/soc/pxa/e740_wm9705.c +++ b/sound/soc/pxa/e740_wm9705.c @@ -103,11 +103,6 @@ static int e740_ac97_init(struct snd_soc_pcm_runtime *rtd) snd_soc_dapm_nc_pin(dapm, "PCBEEP"); snd_soc_dapm_nc_pin(dapm, "MIC2"); - snd_soc_dapm_new_controls(dapm, e740_dapm_widgets, - ARRAY_SIZE(e740_dapm_widgets)); - - snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); - return 0; } @@ -136,6 +131,11 @@ static struct snd_soc_card e740 = { .owner = THIS_MODULE, .dai_link = e740_dai, .num_links = ARRAY_SIZE(e740_dai), + + .dapm_widgets = e740_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(e740_dapm_widgets), + .dapm_routes = audio_map, + .num_dapm_routes = ARRAY_SIZE(audio_map), }; static struct gpio e740_audio_gpios[] = { |