]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ASoC: wm8998: Remove duplicated consts
authorRichard Fitzgerald <rf@opensource.wolfsonmicro.com>
Tue, 3 Nov 2015 15:05:50 +0000 (15:05 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 16 Nov 2015 09:48:52 +0000 (09:48 +0000)
The SOC_xxx_DECL() macros already include 'const' so there's
no need to put a const in the source where they are used.

Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/wm8998.c

index 8782dfb628abb30619716d6f90a9b88be27bb900..7719bc509e50b182a0c63b3280154bac4de277fe 100644 (file)
@@ -199,20 +199,20 @@ static const char * const wm8998_inmux_texts[] = {
        "B",
 };
 
-static const SOC_ENUM_SINGLE_DECL(wm8998_in1muxl_enum,
-                                 ARIZONA_ADC_DIGITAL_VOLUME_1L,
-                                 ARIZONA_IN1L_SRC_SHIFT,
-                                 wm8998_inmux_texts);
+static SOC_ENUM_SINGLE_DECL(wm8998_in1muxl_enum,
+                           ARIZONA_ADC_DIGITAL_VOLUME_1L,
+                           ARIZONA_IN1L_SRC_SHIFT,
+                           wm8998_inmux_texts);
 
-static const SOC_ENUM_SINGLE_DECL(wm8998_in1muxr_enum,
-                                 ARIZONA_ADC_DIGITAL_VOLUME_1R,
-                                 ARIZONA_IN1R_SRC_SHIFT,
-                                 wm8998_inmux_texts);
+static SOC_ENUM_SINGLE_DECL(wm8998_in1muxr_enum,
+                           ARIZONA_ADC_DIGITAL_VOLUME_1R,
+                           ARIZONA_IN1R_SRC_SHIFT,
+                           wm8998_inmux_texts);
 
-static const SOC_ENUM_SINGLE_DECL(wm8998_in2mux_enum,
-                                 ARIZONA_ADC_DIGITAL_VOLUME_2L,
-                                 ARIZONA_IN2L_SRC_SHIFT,
-                                 wm8998_inmux_texts);
+static SOC_ENUM_SINGLE_DECL(wm8998_in2mux_enum,
+                           ARIZONA_ADC_DIGITAL_VOLUME_2L,
+                           ARIZONA_IN2L_SRC_SHIFT,
+                           wm8998_inmux_texts);
 
 static const struct snd_kcontrol_new wm8998_in1mux[2] = {
        SOC_DAPM_ENUM_EXT("IN1L Mux", wm8998_in1muxl_enum,
@@ -522,17 +522,17 @@ static const unsigned int wm8998_aec_loopback_values[] = {
        0, 1, 2, 3, 4, 6, 7, 8, 9,
 };
 
-static const SOC_VALUE_ENUM_SINGLE_DECL(wm8998_aec1_loopback,
-                                       ARIZONA_DAC_AEC_CONTROL_1,
-                                       ARIZONA_AEC_LOOPBACK_SRC_SHIFT, 0xf,
-                                       wm8998_aec_loopback_texts,
-                                       wm8998_aec_loopback_values);
-
-static const SOC_VALUE_ENUM_SINGLE_DECL(wm8998_aec2_loopback,
-                                       ARIZONA_DAC_AEC_CONTROL_2,
-                                       ARIZONA_AEC_LOOPBACK_SRC_SHIFT, 0xf,
-                                       wm8998_aec_loopback_texts,
-                                       wm8998_aec_loopback_values);
+static SOC_VALUE_ENUM_SINGLE_DECL(wm8998_aec1_loopback,
+                                 ARIZONA_DAC_AEC_CONTROL_1,
+                                 ARIZONA_AEC_LOOPBACK_SRC_SHIFT, 0xf,
+                                 wm8998_aec_loopback_texts,
+                                 wm8998_aec_loopback_values);
+
+static SOC_VALUE_ENUM_SINGLE_DECL(wm8998_aec2_loopback,
+                                 ARIZONA_DAC_AEC_CONTROL_2,
+                                 ARIZONA_AEC_LOOPBACK_SRC_SHIFT, 0xf,
+                                 wm8998_aec_loopback_texts,
+                                 wm8998_aec_loopback_values);
 
 static const struct snd_kcontrol_new wm8998_aec_loopback_mux[] = {
        SOC_DAPM_ENUM("AEC1 Loopback", wm8998_aec1_loopback),