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

ASoC: dapm: Use ASoC control macros where possible 



Update the DAPM kcontrol creation macros to use the ASoC macros where a
helpful version exists. One minor fixup is required in adau17x1, the
compiler doesn't like the extra level of macro indirection coupled with
the inline struct definition. Make the struct definition explicit.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20250303171424.444556-12-ckeepax@opensource.cirrus.com


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

include/sound/soc-dapm.h

+22 −40
Original line number Diff line number Diff line
@@ -326,41 +326,37 @@ struct soc_enum; 


/* dapm kcontrol types */

#define SOC_DAPM_DOUBLE(xname, reg, lshift, rshift, max, invert) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

	.info = snd_soc_info_volsw, \

	.get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \

	.private_value = SOC_DOUBLE_VALUE(reg, lshift, rshift, max, invert, 0) }

	SOC_DOUBLE_EXT(xname, reg, lshift, rshift, max, invert, \

		       snd_soc_dapm_get_volsw, snd_soc_dapm_put_volsw)

#define SOC_DAPM_DOUBLE_R(xname, lreg, rreg, shift, max, invert) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

	.info = snd_soc_info_volsw, \

	.get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \

	.private_value = SOC_DOUBLE_R_VALUE(lreg, rreg, shift, max, invert) }

	SOC_DOUBLE_R_EXT(xname, lreg, rreg, shift, max, invert, \

			 snd_soc_dapm_get_volsw, snd_soc_dapm_put_volsw)

#define SOC_DAPM_SINGLE(xname, reg, shift, max, invert) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

	.info = snd_soc_info_volsw, \

	.get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \

	.private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 0) }

#define SOC_DAPM_SINGLE_AUTODISABLE(xname, reg, shift, max, invert) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

	.info = snd_soc_info_volsw, \

	.get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \

	.private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 1) }

	SOC_SINGLE_EXT(xname, reg, shift, max, invert, \

		       snd_soc_dapm_get_volsw, snd_soc_dapm_put_volsw)

#define SOC_DAPM_SINGLE_VIRT(xname, max) \

	SOC_DAPM_SINGLE(xname, SND_SOC_NOPM, 0, max, 0)

#define SOC_DAPM_DOUBLE_R_TLV(xname, lreg, rreg, shift, max, invert, tlv_array) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

	.info = snd_soc_info_volsw, \

	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | SNDRV_CTL_ELEM_ACCESS_READWRITE,\

	.tlv.p = (tlv_array), \

	.get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \

	.private_value = SOC_DOUBLE_R_VALUE(lreg, rreg, shift, max, invert) }

	SOC_DOUBLE_R_EXT_TLV(xname, lreg, rreg, shift, max, invert, \

			     snd_soc_dapm_get_volsw, snd_soc_dapm_put_volsw, \

			     tlv_array)

#define SOC_DAPM_SINGLE_TLV(xname, reg, shift, max, invert, tlv_array) \

	SOC_SINGLE_EXT_TLV(xname, reg, shift, max, invert, \

			   snd_soc_dapm_get_volsw, snd_soc_dapm_put_volsw, \

			   tlv_array)

#define SOC_DAPM_SINGLE_TLV_VIRT(xname, max, tlv_array) \

	SOC_DAPM_SINGLE(xname, SND_SOC_NOPM, 0, max, 0, tlv_array)

#define SOC_DAPM_ENUM(xname, xenum) \

	SOC_ENUM_EXT(xname, xenum, snd_soc_dapm_get_enum_double, \

		     snd_soc_dapm_put_enum_double)

#define SOC_DAPM_ENUM_EXT(xname, xenum, xget, xput) \

	SOC_ENUM_EXT(xname, xenum, xget, xput)



#define SOC_DAPM_SINGLE_AUTODISABLE(xname, reg, shift, max, invert) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

	.info = snd_soc_info_volsw, \

	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | SNDRV_CTL_ELEM_ACCESS_READWRITE,\

	.tlv.p = (tlv_array), \

	.get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \

	.private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 0) }

	.private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 1) }

#define SOC_DAPM_SINGLE_TLV_AUTODISABLE(xname, reg, shift, max, invert, tlv_array) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

	.info = snd_soc_info_volsw, \
@@ -368,20 +364,6 @@ struct soc_enum; 
	.tlv.p = (tlv_array), \

	.get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \

	.private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 1) }

#define SOC_DAPM_SINGLE_TLV_VIRT(xname, max, tlv_array) \

	SOC_DAPM_SINGLE(xname, SND_SOC_NOPM, 0, max, 0, tlv_array)

#define SOC_DAPM_ENUM(xname, xenum) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

	.info = snd_soc_info_enum_double, \

 	.get = snd_soc_dapm_get_enum_double, \

 	.put = snd_soc_dapm_put_enum_double, \

  	.private_value = (unsigned long)&xenum }

#define SOC_DAPM_ENUM_EXT(xname, xenum, xget, xput) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

	.info = snd_soc_info_enum_double, \

	.get = xget, \

	.put = xput, \

	.private_value = (unsigned long)&xenum }

#define SOC_DAPM_PIN_SWITCH(xname) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname " Switch", \

	.info = snd_soc_dapm_info_pin_switch, \

sound/soc/codecs/adau17x1.c

+6 −4
Original line number Diff line number Diff line
@@ -254,11 +254,13 @@ static int adau17x1_dsp_mux_enum_get(struct snd_kcontrol *kcontrol, 
}



#define DECLARE_ADAU17X1_DSP_MUX_CTRL(_name, _label, _stream, _text) \

	const struct snd_kcontrol_new _name = \

		SOC_DAPM_ENUM_EXT(_label, (const struct soc_enum)\

	const struct soc_enum _name##_enum = \

			SOC_ENUM_SINGLE(SND_SOC_NOPM, _stream, \

				ARRAY_SIZE(_text), _text), \

			adau17x1_dsp_mux_enum_get, adau17x1_dsp_mux_enum_put)

					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)



static const char * const adau17x1_dac_mux_text[] = {

	"DSP",