diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-02-18 04:33:59 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-22 21:33:09 -0500 |
commit | 9614be73d810a02f23f3cc19d8eb97b81213545e (patch) | |
tree | ea33e491d4b359bea66853b2fc61f45f669930ca | |
parent | 38dbfb59d1175ef458d006556061adeaa8751b72 (diff) |
ASoC: wm2200: 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: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | sound/soc/codecs/wm2200.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index 57ba315d0c84..1e0a083d8345 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c | |||
@@ -1113,11 +1113,10 @@ static const char *wm2200_rxanc_input_sel_texts[] = { | |||
1113 | "None", "IN1", "IN2", "IN3", | 1113 | "None", "IN1", "IN2", "IN3", |
1114 | }; | 1114 | }; |
1115 | 1115 | ||
1116 | static const struct soc_enum wm2200_rxanc_input_sel = | 1116 | static SOC_ENUM_SINGLE_DECL(wm2200_rxanc_input_sel, |
1117 | SOC_ENUM_SINGLE(WM2200_RXANC_SRC, | 1117 | WM2200_RXANC_SRC, |
1118 | WM2200_IN_RXANC_SEL_SHIFT, | 1118 | WM2200_IN_RXANC_SEL_SHIFT, |
1119 | ARRAY_SIZE(wm2200_rxanc_input_sel_texts), | 1119 | wm2200_rxanc_input_sel_texts); |
1120 | wm2200_rxanc_input_sel_texts); | ||
1121 | 1120 | ||
1122 | static const struct snd_kcontrol_new wm2200_snd_controls[] = { | 1121 | static const struct snd_kcontrol_new wm2200_snd_controls[] = { |
1123 | SOC_SINGLE("IN1 High Performance Switch", WM2200_IN1L_CONTROL, | 1122 | SOC_SINGLE("IN1 High Performance Switch", WM2200_IN1L_CONTROL, |
@@ -1288,11 +1287,10 @@ static const char *wm2200_aec_loopback_texts[] = { | |||
1288 | "OUT1L", "OUT1R", "OUT2L", "OUT2R", | 1287 | "OUT1L", "OUT1R", "OUT2L", "OUT2R", |
1289 | }; | 1288 | }; |
1290 | 1289 | ||
1291 | static const struct soc_enum wm2200_aec_loopback = | 1290 | static SOC_ENUM_SINGLE_DECL(wm2200_aec_loopback, |
1292 | SOC_ENUM_SINGLE(WM2200_DAC_AEC_CONTROL_1, | 1291 | WM2200_DAC_AEC_CONTROL_1, |
1293 | WM2200_AEC_LOOPBACK_SRC_SHIFT, | 1292 | WM2200_AEC_LOOPBACK_SRC_SHIFT, |
1294 | ARRAY_SIZE(wm2200_aec_loopback_texts), | 1293 | wm2200_aec_loopback_texts); |
1295 | wm2200_aec_loopback_texts); | ||
1296 | 1294 | ||
1297 | static const struct snd_kcontrol_new wm2200_aec_loopback_mux = | 1295 | static const struct snd_kcontrol_new wm2200_aec_loopback_mux = |
1298 | SOC_DAPM_ENUM("AEC Loopback", wm2200_aec_loopback); | 1296 | SOC_DAPM_ENUM("AEC Loopback", wm2200_aec_loopback); |