aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-02-18 04:45:36 -0500
committerMark Brown <broonie@linaro.org>2014-02-22 21:55:17 -0500
commitc3518d1bd45ebfdfd88480e5781054fed378fb22 (patch)
tree360ec23b7109bbdf262d0e5e3617275ebf9c99a4
parent38dbfb59d1175ef458d006556061adeaa8751b72 (diff)
ASoC: ml26124: Use SOC_ENUM_SINGLE_DECL()
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>
-rw-r--r--sound/soc/codecs/ml26124.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/codecs/ml26124.c b/sound/soc/codecs/ml26124.c
index 185fa3bc3052..577fb8776ce7 100644
--- a/sound/soc/codecs/ml26124.c
+++ b/sound/soc/codecs/ml26124.c
@@ -73,11 +73,11 @@ static const DECLARE_TLV_DB_SCALE(ngth, -7650, 150, 0);
73static const char * const ml26124_companding[] = {"16bit PCM", "u-law", 73static const char * const ml26124_companding[] = {"16bit PCM", "u-law",
74 "A-law"}; 74 "A-law"};
75 75
76static const struct soc_enum ml26124_adc_companding_enum 76static SOC_ENUM_SINGLE_DECL(ml26124_adc_companding_enum,
77 = SOC_ENUM_SINGLE(ML26124_SAI_TRANS_CTL, 6, 3, ml26124_companding); 77 ML26124_SAI_TRANS_CTL, 6, ml26124_companding);
78 78
79static const struct soc_enum ml26124_dac_companding_enum 79static SOC_ENUM_SINGLE_DECL(ml26124_dac_companding_enum,
80 = SOC_ENUM_SINGLE(ML26124_SAI_RCV_CTL, 6, 3, ml26124_companding); 80 ML26124_SAI_RCV_CTL, 6, ml26124_companding);
81 81
82static const struct snd_kcontrol_new ml26124_snd_controls[] = { 82static const struct snd_kcontrol_new ml26124_snd_controls[] = {
83 SOC_SINGLE_TLV("Capture Digital Volume", ML26124_RECORD_DIG_VOL, 0, 83 SOC_SINGLE_TLV("Capture Digital Volume", ML26124_RECORD_DIG_VOL, 0,
@@ -136,8 +136,8 @@ static const struct snd_kcontrol_new ml26124_output_mixer_controls[] = {
136static const char * const ml26124_input_select[] = {"Analog MIC SingleEnded in", 136static const char * const ml26124_input_select[] = {"Analog MIC SingleEnded in",
137 "Digital MIC in", "Analog MIC Differential in"}; 137 "Digital MIC in", "Analog MIC Differential in"};
138 138
139static const struct soc_enum ml26124_insel_enum = 139static SOC_ENUM_SINGLE_DECL(ml26124_insel_enum,
140 SOC_ENUM_SINGLE(ML26124_MIC_IF_CTL, 0, 3, ml26124_input_select); 140 ML26124_MIC_IF_CTL, 0, ml26124_input_select);
141 141
142static const struct snd_kcontrol_new ml26124_input_mux_controls = 142static const struct snd_kcontrol_new ml26124_input_mux_controls =
143 SOC_DAPM_ENUM("Input Select", ml26124_insel_enum); 143 SOC_DAPM_ENUM("Input Select", ml26124_insel_enum);