]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: codecs: jz4725b: Remove unnecessary const qualifier
authorNathan Chancellor <natechancellor@gmail.com>
Fri, 8 Feb 2019 04:59:18 +0000 (21:59 -0700)
committerMark Brown <broonie@kernel.org>
Fri, 8 Feb 2019 13:00:52 +0000 (13:00 +0000)
Clang warns:

sound/soc/codecs/jz4725b.c:177:14: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
static const SOC_VALUE_ENUM_SINGLE_DECL(jz4725b_codec_adc_src_enum,
             ^
include/sound/soc.h:356:2: note: expanded from macro 'SOC_VALUE_ENUM_SINGLE_DECL'
        SOC_VALUE_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xmask, xtexts, xvalues)
        ^
include/sound/soc.h:353:2: note: expanded from macro 'SOC_VALUE_ENUM_DOUBLE_DECL'
        const struct soc_enum name = SOC_VALUE_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, \
        ^

As it points out, SOC_VALUE_ENUM_DOUBLE_DECL has the const attribute in
its definition so remove it here.

Fixes: e9d97b05a80f ("ASoC: codecs: Add jz4725b-codec driver")
Link: https://github.com/ClangBuiltLinux/linux/issues/354
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/jz4725b.c

index 103ccbc5d55c66f4b6675938ce5a8b571b537e4e..766354c730765a006e6c3b91c8c02e3d0b0394f9 100644 (file)
@@ -173,12 +173,12 @@ static const char * const jz4725b_codec_adc_src_texts[] = {
        "Mic 1", "Mic 2", "Line In", "Mixer",
 };
 static const unsigned int jz4725b_codec_adc_src_values[] = { 0, 1, 2, 3, };
-static const SOC_VALUE_ENUM_SINGLE_DECL(jz4725b_codec_adc_src_enum,
-                                       JZ4725B_CODEC_REG_CR3,
-                                       REG_CR3_INSEL_OFFSET,
-                                       REG_CR3_INSEL_MASK,
-                                       jz4725b_codec_adc_src_texts,
-                                       jz4725b_codec_adc_src_values);
+static SOC_VALUE_ENUM_SINGLE_DECL(jz4725b_codec_adc_src_enum,
+                                 JZ4725B_CODEC_REG_CR3,
+                                 REG_CR3_INSEL_OFFSET,
+                                 REG_CR3_INSEL_MASK,
+                                 jz4725b_codec_adc_src_texts,
+                                 jz4725b_codec_adc_src_values);
 static const struct snd_kcontrol_new jz4725b_codec_adc_src_ctrl =
                        SOC_DAPM_ENUM("Route", jz4725b_codec_adc_src_enum);