Unverified Commit 269b8442 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

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: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202503061119.4QGlnOi6-lkp@intel.com/


Fixes: c951b207 ("ASoC: dapm: Use ASoC control macros where possible")
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20250306104233.1638625-1-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c6141ba0

sound/soc/codecs/adau17x1.c

+4 −6
Original line number Diff line number Diff line
@@ -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",