xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ALSA] soc - tlv320aic3x - Convert to use bulk registration APIs

Browse Source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Mark Brown
2008-05-13 14:55:22 +02:00
committed by Jaroslav Kysela
parent 105f1c2844
commit d0cc0d3a95
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sound/soc/codecs/tlv320aic3x.c
View File

@@ -497,7 +497,7 @@ static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = {
SND_SOC_DAPM_INPUT("LINE2R"), SND_SOC_DAPM_INPUT("LINE2R"),
}; };
static const char *intercon[][3] = { static const struct snd_soc_dapm_route intercon[] = {
/* Left Output */ /* Left Output */
{"Left DAC Mux", "DAC_L1", "Left DAC"}, {"Left DAC Mux", "DAC_L1", "Left DAC"},
{"Left DAC Mux", "DAC_L2", "Left DAC"}, {"Left DAC Mux", "DAC_L2", "Left DAC"},
@@ -641,22 +641,15 @@ static const char *intercon[][3] = {
{"Right Line Out", NULL, "Right Line2 Bypass Mixer"}, {"Right Line Out", NULL, "Right Line2 Bypass Mixer"},
{"Mono Out", NULL, "Right Line2 Bypass Mixer"}, {"Mono Out", NULL, "Right Line2 Bypass Mixer"},
{"Right HP Out", NULL, "Right Line2 Bypass Mixer"}, {"Right HP Out", NULL, "Right Line2 Bypass Mixer"},
/* terminator */
{NULL, NULL, NULL},
}; };
static int aic3x_add_widgets(struct snd_soc_codec *codec) static int aic3x_add_widgets(struct snd_soc_codec *codec)
{ {
int i; snd_soc_dapm_new_controls(codec, aic3x_dapm_widgets,
ARRAY_SIZE(aic3x_dapm_widgets));
for (i = 0; i < ARRAY_SIZE(aic3x_dapm_widgets); i++)
snd_soc_dapm_new_control(codec, &aic3x_dapm_widgets[i]);
/* set up audio path interconnects */ /* set up 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]);
snd_soc_dapm_new_widgets(codec); snd_soc_dapm_new_widgets(codec);
return 0; return 0;