]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: wm2200: Use SOC_ENUM_SINGLE_DECL()
authorTakashi Iwai <tiwai@suse.de>
Tue, 18 Feb 2014 09:33:59 +0000 (10:33 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 23 Feb 2014 02:33:09 +0000 (11:33 +0900)
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>
sound/soc/codecs/wm2200.c

index 57ba315d0c84d41c4c5f8b390014cde50f84f85f..1e0a083d83459c9a501081cc0b2351f8c098f372 100644 (file)
@@ -1113,11 +1113,10 @@ static const char *wm2200_rxanc_input_sel_texts[] = {
        "None", "IN1", "IN2", "IN3",
 };
 
-static const struct soc_enum wm2200_rxanc_input_sel =
-       SOC_ENUM_SINGLE(WM2200_RXANC_SRC,
-                       WM2200_IN_RXANC_SEL_SHIFT,
-                       ARRAY_SIZE(wm2200_rxanc_input_sel_texts),
-                       wm2200_rxanc_input_sel_texts);
+static SOC_ENUM_SINGLE_DECL(wm2200_rxanc_input_sel,
+                           WM2200_RXANC_SRC,
+                           WM2200_IN_RXANC_SEL_SHIFT,
+                           wm2200_rxanc_input_sel_texts);
 
 static const struct snd_kcontrol_new wm2200_snd_controls[] = {
 SOC_SINGLE("IN1 High Performance Switch", WM2200_IN1L_CONTROL,
@@ -1288,11 +1287,10 @@ static const char *wm2200_aec_loopback_texts[] = {
        "OUT1L", "OUT1R", "OUT2L", "OUT2R",
 };
 
-static const struct soc_enum wm2200_aec_loopback =
-       SOC_ENUM_SINGLE(WM2200_DAC_AEC_CONTROL_1,
-                       WM2200_AEC_LOOPBACK_SRC_SHIFT,
-                       ARRAY_SIZE(wm2200_aec_loopback_texts),
-                       wm2200_aec_loopback_texts);
+static SOC_ENUM_SINGLE_DECL(wm2200_aec_loopback,
+                           WM2200_DAC_AEC_CONTROL_1,
+                           WM2200_AEC_LOOPBACK_SRC_SHIFT,
+                           wm2200_aec_loopback_texts);
 
 static const struct snd_kcontrol_new wm2200_aec_loopback_mux =
        SOC_DAPM_ENUM("AEC Loopback", wm2200_aec_loopback);