| Message ID | 20200124155750.33753-1-natechancellor@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e91440ddfbf4a5d7c541aed8c55c0ec76d9b26c7 |
| Headers | show |
| Series | ASoC: rt1015: Remove unnecessary const | expand |
On Fri, Jan 24, 2020 at 7:58 AM Nathan Chancellor <natechancellor@gmail.com> wrote: > > Clang warns: > > ../sound/soc/codecs/rt1015.c:392:14: warning: duplicate 'const' > declaration specifier [-Wduplicate-decl-specifier] > static const SOC_ENUM_SINGLE_DECL(rt1015_boost_mode_enum, 0, 0, > ^ > ../include/sound/soc.h:355:2: note: expanded from macro > 'SOC_ENUM_SINGLE_DECL' > SOC_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xtexts) > ^ > ../include/sound/soc.h:352:2: note: expanded from macro > 'SOC_ENUM_DOUBLE_DECL' > const struct soc_enum name = SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, \ > ^ > 1 warning generated. > > Remove the const after static to fix it. > > Fixes: df31007400c3 ("ASoC: rt1015: add rt1015 amplifier driver") > Link: https://github.com/ClangBuiltLinux/linux/issues/845 > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Thanks for the patch! Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> > --- > sound/soc/codecs/rt1015.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/soc/codecs/rt1015.c b/sound/soc/codecs/rt1015.c > index 4a9c5b54008f..6d490e2dbc25 100644 > --- a/sound/soc/codecs/rt1015.c > +++ b/sound/soc/codecs/rt1015.c > @@ -389,7 +389,7 @@ static const char * const rt1015_boost_mode[] = { > "Bypass", "Adaptive", "Fixed Adaptive" > }; > > -static const SOC_ENUM_SINGLE_DECL(rt1015_boost_mode_enum, 0, 0, > +static SOC_ENUM_SINGLE_DECL(rt1015_boost_mode_enum, 0, 0, > rt1015_boost_mode); > > static int rt1015_boost_mode_get(struct snd_kcontrol *kcontrol, > --
diff --git a/sound/soc/codecs/rt1015.c b/sound/soc/codecs/rt1015.c index 4a9c5b54008f..6d490e2dbc25 100644 --- a/sound/soc/codecs/rt1015.c +++ b/sound/soc/codecs/rt1015.c @@ -389,7 +389,7 @@ static const char * const rt1015_boost_mode[] = { "Bypass", "Adaptive", "Fixed Adaptive" }; -static const SOC_ENUM_SINGLE_DECL(rt1015_boost_mode_enum, 0, 0, +static SOC_ENUM_SINGLE_DECL(rt1015_boost_mode_enum, 0, 0, rt1015_boost_mode); static int rt1015_boost_mode_get(struct snd_kcontrol *kcontrol,
Clang warns: ../sound/soc/codecs/rt1015.c:392:14: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier] static const SOC_ENUM_SINGLE_DECL(rt1015_boost_mode_enum, 0, 0, ^ ../include/sound/soc.h:355:2: note: expanded from macro 'SOC_ENUM_SINGLE_DECL' SOC_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xtexts) ^ ../include/sound/soc.h:352:2: note: expanded from macro 'SOC_ENUM_DOUBLE_DECL' const struct soc_enum name = SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, \ ^ 1 warning generated. Remove the const after static to fix it. Fixes: df31007400c3 ("ASoC: rt1015: add rt1015 amplifier driver") Link: https://github.com/ClangBuiltLinux/linux/issues/845 Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> --- sound/soc/codecs/rt1015.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)