Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 785b3c4e authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Remove deprecated ENUM/MUX macros 



Since there are no users left, we can remove the deprecated ENUM and MUX macros
which are just alias for other macros.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent e13dd8ce

include/sound/soc-dapm.h

+0 −12
Original line number Original line Diff line number Diff line
@@ -107,10 +107,6 @@ struct device; 
{	.id = snd_soc_dapm_mux, .name = wname, \

{	.id = snd_soc_dapm_mux, .name = wname, \

	SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \

	SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \

	.kcontrol_news = wcontrols, .num_kcontrols = 1}

	.kcontrol_news = wcontrols, .num_kcontrols = 1}

#define SND_SOC_DAPM_VIRT_MUX(wname, wreg, wshift, winvert, wcontrols) \

	SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols)

#define SND_SOC_DAPM_VALUE_MUX(wname, wreg, wshift, winvert, wcontrols) \

	SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols)





/* Simplified versions of above macros, assuming wncontrols = ARRAY_SIZE(wcontrols) */

/* Simplified versions of above macros, assuming wncontrols = ARRAY_SIZE(wcontrols) */

#define SOC_PGA_ARRAY(wname, wreg, wshift, winvert,\

#define SOC_PGA_ARRAY(wname, wreg, wshift, winvert,\
@@ -166,10 +162,6 @@ struct device; 
	SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \

	SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \

	.kcontrol_news = wcontrols, .num_kcontrols = 1, \

	.kcontrol_news = wcontrols, .num_kcontrols = 1, \

	.event = wevent, .event_flags = wflags}

	.event = wevent, .event_flags = wflags}

#define SND_SOC_DAPM_VIRT_MUX_E(wname, wreg, wshift, winvert, wcontrols, \

	wevent, wflags) \

	SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, wevent, \

		wflags)





/* additional sequencing control within an event type */

/* additional sequencing control within an event type */

#define SND_SOC_DAPM_PGA_S(wname, wsubseq, wreg, wshift, winvert, \

#define SND_SOC_DAPM_PGA_S(wname, wsubseq, wreg, wshift, winvert, \
@@ -305,16 +297,12 @@ struct device; 
 	.get = snd_soc_dapm_get_enum_double, \

 	.get = snd_soc_dapm_get_enum_double, \

 	.put = snd_soc_dapm_put_enum_double, \

 	.put = snd_soc_dapm_put_enum_double, \

  	.private_value = (unsigned long)&xenum }

  	.private_value = (unsigned long)&xenum }

#define SOC_DAPM_ENUM_VIRT(xname, xenum) \

	SOC_DAPM_ENUM(xname, xenum)

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

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

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

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

	.info = snd_soc_info_enum_double, \

	.info = snd_soc_info_enum_double, \

	.get = xget, \

	.get = xget, \

	.put = xput, \

	.put = xput, \

	.private_value = (unsigned long)&xenum }

	.private_value = (unsigned long)&xenum }

#define SOC_DAPM_VALUE_ENUM(xname, xenum) \

	SOC_DAPM_ENUM(xname, xenum)

#define SOC_DAPM_PIN_SWITCH(xname) \

#define SOC_DAPM_PIN_SWITCH(xname) \

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

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

	.info = snd_soc_dapm_info_pin_switch, \

	.info = snd_soc_dapm_info_pin_switch, \

include/sound/soc.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -196,8 +196,6 @@ 
	.info = snd_soc_info_enum_double, \

	.info = snd_soc_info_enum_double, \

	.get = snd_soc_get_enum_double, .put = snd_soc_put_enum_double, \

	.get = snd_soc_get_enum_double, .put = snd_soc_put_enum_double, \

	.private_value = (unsigned long)&xenum }

	.private_value = (unsigned long)&xenum }

#define SOC_VALUE_ENUM(xname, xenum) \

	SOC_ENUM(xname, xenum)

#define SOC_SINGLE_EXT(xname, xreg, xshift, xmax, xinvert,\

#define SOC_SINGLE_EXT(xname, xreg, xshift, xmax, xinvert,\

	 xhandler_get, xhandler_put) \

	 xhandler_get, xhandler_put) \

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

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