Commit cdbdd167 authored by Mark Brown's avatar Mark Brown Committed by Takashi Iwai

ALSA: ASoC: Convert playpaq_wm8510 to bulk route registration API

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d5d8d837
...@@ -304,7 +304,7 @@ static const struct snd_soc_dapm_widget playpaq_dapm_widgets[] = { ...@@ -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 */ /* speaker connected to SPKOUT */
{"Ext Spk", NULL, "SPKOUTP"}, {"Ext Spk", NULL, "SPKOUTP"},
{"Ext Spk", NULL, "SPKOUTN"}, {"Ext Spk", NULL, "SPKOUTN"},
...@@ -312,9 +312,6 @@ static const char *intercon[][3] = { ...@@ -312,9 +312,6 @@ static const char *intercon[][3] = {
{"Mic Bias", NULL, "Int Mic"}, {"Mic Bias", NULL, "Int Mic"},
{"MICN", NULL, "Mic Bias"}, {"MICN", NULL, "Mic Bias"},
{"MICP", 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) ...@@ -334,11 +331,8 @@ static int playpaq_wm8510_init(struct snd_soc_codec *codec)
/* /*
* Setup audio path interconnects * Setup audio path interconnects
*/ */
for (i = 0; intercon[i][0] != NULL; i++) { snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
snd_soc_dapm_connect_input(codec,
intercon[i][0],
intercon[i][1], intercon[i][2]);
}
/* always connected pins */ /* always connected pins */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment