20ea6adbf1
Build system: x86_64 Build-tested: bcm2708, bcm2709, bcm2710, bcm2711 Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B Signed-off-by: Marty Jones <mj8263788@gmail.com> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
76 lines
3.1 KiB
Diff
76 lines
3.1 KiB
Diff
From fb7adf252e4813f86d2871448a0bdb586bfcd1f1 Mon Sep 17 00:00:00 2001
|
|
From: Nathan Chancellor <nathan@kernel.org>
|
|
Date: Mon, 31 Jan 2022 17:20:55 -0700
|
|
Subject: [PATCH] ASoC: bcm: allo-piano-dac-plus: Remove unnecessary
|
|
const specifiers
|
|
|
|
Clang warns:
|
|
|
|
sound/soc/bcm/allo-piano-dac-plus.c:66:14: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
|
|
static const SOC_ENUM_SINGLE_DECL(allo_piano_mode_enum,
|
|
^
|
|
./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, \
|
|
^
|
|
sound/soc/bcm/allo-piano-dac-plus.c:75:14: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
|
|
static const SOC_ENUM_SINGLE_DECL(allo_piano_dual_mode_enum,
|
|
^
|
|
./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, \
|
|
^
|
|
sound/soc/bcm/allo-piano-dac-plus.c:96:14: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
|
|
static const SOC_ENUM_SINGLE_DECL(allo_piano_enum,
|
|
^
|
|
./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, \
|
|
^
|
|
3 warnings generated.
|
|
|
|
SOC_VALUE_ENUM_DOUBLE_DECL already has a const specifier. Remove the duplicate
|
|
const specifiers to clean up the warnings.
|
|
|
|
Fixes: 42444979e710 ("Add support for all the downstream rpi sound card drivers")
|
|
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
|
|
---
|
|
sound/soc/bcm/allo-piano-dac-plus.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/sound/soc/bcm/allo-piano-dac-plus.c
|
|
+++ b/sound/soc/bcm/allo-piano-dac-plus.c
|
|
@@ -63,7 +63,7 @@ static const char * const allo_piano_mod
|
|
"2.2",
|
|
};
|
|
|
|
-static const SOC_ENUM_SINGLE_DECL(allo_piano_mode_enum,
|
|
+static SOC_ENUM_SINGLE_DECL(allo_piano_mode_enum,
|
|
0, 0, allo_piano_mode_texts);
|
|
|
|
static const char * const allo_piano_dual_mode_texts[] = {
|
|
@@ -72,7 +72,7 @@ static const char * const allo_piano_dua
|
|
"Dual-Stereo",
|
|
};
|
|
|
|
-static const SOC_ENUM_SINGLE_DECL(allo_piano_dual_mode_enum,
|
|
+static SOC_ENUM_SINGLE_DECL(allo_piano_dual_mode_enum,
|
|
0, 0, allo_piano_dual_mode_texts);
|
|
|
|
static const char * const allo_piano_dsp_low_pass_texts[] = {
|
|
@@ -93,7 +93,7 @@ static const char * const allo_piano_dsp
|
|
"200",
|
|
};
|
|
|
|
-static const SOC_ENUM_SINGLE_DECL(allo_piano_enum,
|
|
+static SOC_ENUM_SINGLE_DECL(allo_piano_enum,
|
|
0, 0, allo_piano_dsp_low_pass_texts);
|
|
|
|
static int __snd_allo_piano_dsp_program(struct snd_soc_pcm_runtime *rtd,
|