evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: tas2552: Clean up the Digital - Analog DAPM route definition

Browse source 
The strings should be: 'static const char * const tas2552_input_texts[]'
SOC_DAPM_ENUM should have "Route" in place of xname and no need to have it
as an array.
Also align the parameters.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Peter Ujfalusi 2015-06-04 16:04:26 +03:00 • committed by Mark Brown
parent 3f747a810e
commit 609e71313b
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sound/soc/codecs/tas2552.c
View file

@ -83,17 +83,15 @@ struct tas2552_data {
unsigned int tdm_delay; unsigned int tdm_delay;
}; };
/* Input mux controls */
static const char *tas2552_input_texts[] = {
"Digital", "Analog"
};
/* Input mux controls */
static const char * const tas2552_input_texts[] = {
"Digital", "Analog" };
static SOC_ENUM_SINGLE_DECL(tas2552_input_mux_enum, TAS2552_CFG_3, 7, static SOC_ENUM_SINGLE_DECL(tas2552_input_mux_enum, TAS2552_CFG_3, 7,
tas2552_input_texts); tas2552_input_texts);
static const struct snd_kcontrol_new tas2552_input_mux_control[] = { static const struct snd_kcontrol_new tas2552_input_mux_control =
SOC_DAPM_ENUM("Input selection", tas2552_input_mux_enum) SOC_DAPM_ENUM("Route", tas2552_input_mux_enum);
};
static const struct snd_soc_dapm_widget tas2552_dapm_widgets[] = static const struct snd_soc_dapm_widget tas2552_dapm_widgets[] =
{ {
@ -101,7 +99,7 @@ static const struct snd_soc_dapm_widget tas2552_dapm_widgets[] =
/* MUX Controls */ /* MUX Controls */
SND_SOC_DAPM_MUX("Input selection", SND_SOC_NOPM, 0, 0, SND_SOC_DAPM_MUX("Input selection", SND_SOC_NOPM, 0, 0,
tas2552_input_mux_control), &tas2552_input_mux_control),
SND_SOC_DAPM_AIF_IN("DAC IN", "DAC Playback", 0, SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_AIF_IN("DAC IN", "DAC Playback", 0, SND_SOC_NOPM, 0, 0),
SND_SOC_DAPM_DAC("DAC", NULL, SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_DAC("DAC", NULL, SND_SOC_NOPM, 0, 0),