diff options
| author |   Charles Keepax <ckeepax@opensource.cirrus.com> | 2025-03-06 10:42:33 +0000 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2025-03-06 13:26:59 +0000 |
| commit | 269b844239149a9bbaba66518db99ebb06554a15 (patch) | |
| tree | 1cb2a8569f48aed8b407157c09abbee8dc3f50b6 | |
| parent | ASoC: Merge up fixes (diff) | |
| download | wireguard-linux-269b844239149a9bbaba66518db99ebb06554a15.tar.xz wireguard-linux-269b844239149a9bbaba66518db99ebb06554a15.zip | |
ASoC: dapm: Fix changes to DECLARE_ADAU17X1_DSP_MUX_CTRL
The changes to DECLARE_ADAU17X1_DSP_MUX_CTRL did avoid the issue with a
compiler not liking all the macro indirection. However it introduced a
new issue with respect to the mux not being declared static:
sound/soc/codecs/adau17x1.c:275:8: sparse: sparse: symbol
'adau17x1_dac_mux' was not declared. Should it be static?
sound/soc/codecs/adau17x1.c:278:8: sparse: sparse: symbol
'adau17x1_capture_mux' was not declared. Should it be static?
Fix this up by going back to the inline declaration of the soc_enum, but
just call SOC_ENUM_EXT directly rather than indirecting through
SOC_DAPM_ENUM_EXT.
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202503061119.4QGlnOi6-lkp@intel.com/
Fixes: c951b20766f0 ("ASoC: dapm: Use ASoC control macros where possible")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20250306104233.1638625-1-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | sound/soc/codecs/adau17x1.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sound/soc/codecs/adau17x1.c b/sound/soc/codecs/adau17x1.c index 2ebb5c90bdd9..0b6b0d2115eb 100644 --- a/sound/soc/codecs/adau17x1.c +++ b/sound/soc/codecs/adau17x1.c @@ -254,13 +254,11 @@ static int adau17x1_dsp_mux_enum_get(struct snd_kcontrol *kcontrol, } #define DECLARE_ADAU17X1_DSP_MUX_CTRL(_name, _label, _stream, _text) \ - const struct soc_enum _name##_enum = \ - SOC_ENUM_SINGLE(SND_SOC_NOPM, _stream, \ - ARRAY_SIZE(_text), _text); \ const struct snd_kcontrol_new _name = \ - SOC_DAPM_ENUM_EXT(_label, _name##_enum, \ - adau17x1_dsp_mux_enum_get, \ - adau17x1_dsp_mux_enum_put) + SOC_ENUM_EXT(_label, (const struct soc_enum)\ + SOC_ENUM_SINGLE(SND_SOC_NOPM, _stream, \ + ARRAY_SIZE(_text), _text), \ + adau17x1_dsp_mux_enum_get, adau17x1_dsp_mux_enum_put) static const char * const adau17x1_dac_mux_text[] = { "DSP", |