diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-10-16 11:00:06 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-16 12:50:20 +0200 |
| commit | cdbdd1676a5379f1d5cbd4d476f5e349f445befe (patch) | |
| tree | 42e6bc3eb15e2c4e84544b261863223aa702a698 /sound | |
| parent | d5d8d83773165b951d190717637bfbc1eb0111a0 (diff) | |
| download | linux-3.10-cdbdd1676a5379f1d5cbd4d476f5e349f445befe.tar.gz linux-3.10-cdbdd1676a5379f1d5cbd4d476f5e349f445befe.tar.bz2 linux-3.10-cdbdd1676a5379f1d5cbd4d476f5e349f445befe.zip | |
ALSA: ASoC: Convert playpaq_wm8510 to bulk route registration API
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/at32/playpaq_wm8510.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sound/soc/at32/playpaq_wm8510.c b/sound/soc/at32/playpaq_wm8510.c index 98a2d5826a8..b1966e4dfcd 100644 --- a/sound/soc/at32/playpaq_wm8510.c +++ b/sound/soc/at32/playpaq_wm8510.c @@ -304,7 +304,7 @@ static const struct snd_soc_dapm_widget playpaq_dapm_widgets[] = { -static const char *intercon[][3] = { +static const struct snd_soc_dapm_route intercon[] = { /* speaker connected to SPKOUT */ {"Ext Spk", NULL, "SPKOUTP"}, {"Ext Spk", NULL, "SPKOUTN"}, @@ -312,9 +312,6 @@ static const char *intercon[][3] = { {"Mic Bias", NULL, "Int Mic"}, {"MICN", NULL, "Mic Bias"}, {"MICP", NULL, "Mic Bias"}, - - /* Terminator */ - {NULL, NULL, NULL}, }; @@ -334,11 +331,8 @@ static int playpaq_wm8510_init(struct snd_soc_codec *codec) /* * Setup audio path interconnects */ - for (i = 0; intercon[i][0] != NULL; i++) { - snd_soc_dapm_connect_input(codec, - intercon[i][0], - intercon[i][1], intercon[i][2]); - } + snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon)); + /* always connected pins */ |