jenna
/
kernel_samsung_sm7125
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: twl4030: Use SOC_ENUM_SINGLE_DECL()

Browse Source 
Just replace with the helper macro.  No functional change at all.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
tirimbino
Takashi Iwai 11 years ago committed by Mark Brown
parent 38dbfb59d1
commit 9f04fba797
1 changed files with 36 additions and 48 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 60
      sound/soc/codecs/twl4030.c

60
sound/soc/codecs/twl4030.c
Unescape View File

@ -415,9 +415,8 @@ static const struct snd_kcontrol_new twl4030_dapm_carkitr_controls[] = {
static const char *twl4030_handsfreel_texts[] =
{"Voice", "AudioL1", "AudioL2", "AudioR2"};
static const struct soc_enum twl4030_handsfreel_enum =
SOC_ENUM_SINGLE(TWL4030_REG_HFL_CTL, 0,
ARRAY_SIZE(twl4030_handsfreel_texts),
static SOC_ENUM_SINGLE_DECL(twl4030_handsfreel_enum,
TWL4030_REG_HFL_CTL, 0,
twl4030_handsfreel_texts);
static const struct snd_kcontrol_new twl4030_dapm_handsfreel_control =
@ -431,9 +430,8 @@ static const struct snd_kcontrol_new twl4030_dapm_handsfreelmute_control =
static const char *twl4030_handsfreer_texts[] =
{"Voice", "AudioR1", "AudioR2", "AudioL2"};
static const struct soc_enum twl4030_handsfreer_enum =
SOC_ENUM_SINGLE(TWL4030_REG_HFR_CTL, 0,
ARRAY_SIZE(twl4030_handsfreer_texts),
static SOC_ENUM_SINGLE_DECL(twl4030_handsfreer_enum,
TWL4030_REG_HFR_CTL, 0,
twl4030_handsfreer_texts);
static const struct snd_kcontrol_new twl4030_dapm_handsfreer_control =
@ -448,9 +446,8 @@ static const struct snd_kcontrol_new twl4030_dapm_handsfreermute_control =
static const char *twl4030_vibra_texts[] =
{"AudioL1", "AudioR1", "AudioL2", "AudioR2"};
static const struct soc_enum twl4030_vibra_enum =
SOC_ENUM_SINGLE(TWL4030_REG_VIBRA_CTL, 2,
ARRAY_SIZE(twl4030_vibra_texts),
static SOC_ENUM_SINGLE_DECL(twl4030_vibra_enum,
TWL4030_REG_VIBRA_CTL, 2,
twl4030_vibra_texts);
static const struct snd_kcontrol_new twl4030_dapm_vibra_control =
@ -460,9 +457,8 @@ SOC_DAPM_ENUM("Route", twl4030_vibra_enum);
static const char *twl4030_vibrapath_texts[] =
{"Local vibrator", "Audio"};
static const struct soc_enum twl4030_vibrapath_enum =
SOC_ENUM_SINGLE(TWL4030_REG_VIBRA_CTL, 4,
ARRAY_SIZE(twl4030_vibrapath_texts),
static SOC_ENUM_SINGLE_DECL(twl4030_vibrapath_enum,
TWL4030_REG_VIBRA_CTL, 4,
twl4030_vibrapath_texts);
static const struct snd_kcontrol_new twl4030_dapm_vibrapath_control =
@ -490,9 +486,8 @@ static const struct snd_kcontrol_new twl4030_dapm_analogrmic_controls[] = {
static const char *twl4030_micpathtx1_texts[] =
{"Analog", "Digimic0"};
static const struct soc_enum twl4030_micpathtx1_enum =
SOC_ENUM_SINGLE(TWL4030_REG_ADCMICSEL, 0,
ARRAY_SIZE(twl4030_micpathtx1_texts),
static SOC_ENUM_SINGLE_DECL(twl4030_micpathtx1_enum,
TWL4030_REG_ADCMICSEL, 0,
twl4030_micpathtx1_texts);
static const struct snd_kcontrol_new twl4030_dapm_micpathtx1_control =
@ -502,9 +497,8 @@ SOC_DAPM_ENUM("Route", twl4030_micpathtx1_enum);
static const char *twl4030_micpathtx2_texts[] =
{"Analog", "Digimic1"};
static const struct soc_enum twl4030_micpathtx2_enum =
SOC_ENUM_SINGLE(TWL4030_REG_ADCMICSEL, 2,
ARRAY_SIZE(twl4030_micpathtx2_texts),
static SOC_ENUM_SINGLE_DECL(twl4030_micpathtx2_enum,
TWL4030_REG_ADCMICSEL, 2,
twl4030_micpathtx2_texts);
static const struct snd_kcontrol_new twl4030_dapm_micpathtx2_control =
@ -955,9 +949,8 @@ static const char *twl4030_op_modes_texts[] = {
"Option 2 (voice/audio)", "Option 1 (audio)"
};
static const struct soc_enum twl4030_op_modes_enum =
SOC_ENUM_SINGLE(TWL4030_REG_CODEC_MODE, 0,
ARRAY_SIZE(twl4030_op_modes_texts),
static SOC_ENUM_SINGLE_DECL(twl4030_op_modes_enum,
TWL4030_REG_CODEC_MODE, 0,
twl4030_op_modes_texts);
static int snd_soc_put_twl4030_opmode_enum_double(struct snd_kcontrol *kcontrol,
@ -1044,9 +1037,8 @@ static const char *twl4030_avadc_clk_priority_texts[] = {
"Voice high priority", "HiFi high priority"
};
static const struct soc_enum twl4030_avadc_clk_priority_enum =
SOC_ENUM_SINGLE(TWL4030_REG_AVADC_CTL, 2,
ARRAY_SIZE(twl4030_avadc_clk_priority_texts),
static SOC_ENUM_SINGLE_DECL(twl4030_avadc_clk_priority_enum,
TWL4030_REG_AVADC_CTL, 2,
twl4030_avadc_clk_priority_texts);
static const char *twl4030_rampdelay_texts[] = {
@ -1055,9 +1047,8 @@ static const char *twl4030_rampdelay_texts[] = {
"3495/2581/1748 ms"
};
static const struct soc_enum twl4030_rampdelay_enum =
SOC_ENUM_SINGLE(TWL4030_REG_HS_POPN_SET, 2,
ARRAY_SIZE(twl4030_rampdelay_texts),
static SOC_ENUM_SINGLE_DECL(twl4030_rampdelay_enum,
TWL4030_REG_HS_POPN_SET, 2,
twl4030_rampdelay_texts);
/* Vibra H-bridge direction mode */
@ -1065,9 +1056,8 @@ static const char *twl4030_vibradirmode_texts[] = {
"Vibra H-bridge direction", "Audio data MSB",
};
static const struct soc_enum twl4030_vibradirmode_enum =
SOC_ENUM_SINGLE(TWL4030_REG_VIBRA_CTL, 5,
ARRAY_SIZE(twl4030_vibradirmode_texts),
static SOC_ENUM_SINGLE_DECL(twl4030_vibradirmode_enum,
TWL4030_REG_VIBRA_CTL, 5,
twl4030_vibradirmode_texts);
/* Vibra H-bridge direction */
@ -1075,9 +1065,8 @@ static const char *twl4030_vibradir_texts[] = {
"Positive polarity", "Negative polarity",
};
static const struct soc_enum twl4030_vibradir_enum =
SOC_ENUM_SINGLE(TWL4030_REG_VIBRA_CTL, 1,
ARRAY_SIZE(twl4030_vibradir_texts),
static SOC_ENUM_SINGLE_DECL(twl4030_vibradir_enum,
TWL4030_REG_VIBRA_CTL, 1,
twl4030_vibradir_texts);
/* Digimic Left and right swapping */
@ -1085,9 +1074,8 @@ static const char *twl4030_digimicswap_texts[] = {
"Not swapped", "Swapped",
};
static const struct soc_enum twl4030_digimicswap_enum =
SOC_ENUM_SINGLE(TWL4030_REG_MISC_SET_1, 0,
ARRAY_SIZE(twl4030_digimicswap_texts),
static SOC_ENUM_SINGLE_DECL(twl4030_digimicswap_enum,
TWL4030_REG_MISC_SET_1, 0,
twl4030_digimicswap_texts);
static const struct snd_kcontrol_new twl4030_snd_controls[] = {

Write Preview
Loading…
Cancel
Save