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

Commit 460acbec authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: core: Introduce SOC_DOUBLE_VALUE macro 



With the new macro we can remove duplicated code
for the SOC_DOUBLE type of controls.
We can also remap the SOC_SINGLE_VALUE macro to
SOC_DOUBLE_VALUE

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 672f4c4d

include/sound/soc.h

+16 −18
Original line number Diff line number Diff line
@@ -28,10 +28,12 @@ 
/*

 * Convenience kcontrol builders

 */

#define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) \

#define SOC_DOUBLE_VALUE(xreg, shift_left, shift_right, xmax, xinvert) \

	((unsigned long)&(struct soc_mixer_control) \

	{.reg = xreg, .shift = xshift, .rshift = xshift, .max = xmax, \

	.platform_max = xmax, .invert = xinvert})

	{.reg = xreg, .shift = shift_left, .rshift = shift_right, \

	.max = xmax, .platform_max = xmax, .invert = xinvert})

#define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) \

	SOC_DOUBLE_VALUE(xreg, xshift, xshift, xmax, xinvert)

#define SOC_SINGLE_VALUE_EXT(xreg, xmax, xinvert) \

	((unsigned long)&(struct soc_mixer_control) \

	{.reg = xreg, .max = xmax, .platform_max = xmax, .invert = xinvert})
@@ -48,13 +50,12 @@ 
	.info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\

	.put = snd_soc_put_volsw, \

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

#define SOC_DOUBLE(xname, xreg, shift_left, shift_right, xmax, xinvert) \

#define SOC_DOUBLE(xname, reg, shift_left, shift_right, max, invert) \

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

	.info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \

	.put = snd_soc_put_volsw, \

	.private_value = (unsigned long)&(struct soc_mixer_control) \

		{.reg = xreg, .shift = shift_left, .rshift = shift_right, \

		 .max = xmax, .platform_max = xmax, .invert = xinvert} }

	.private_value = SOC_DOUBLE_VALUE(reg, shift_left, shift_right, \

					  max, invert) }

#define SOC_DOUBLE_R(xname, reg_left, reg_right, xshift, xmax, xinvert) \

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

	.info = snd_soc_info_volsw_2r, \
@@ -62,16 +63,15 @@ 
	.private_value = (unsigned long)&(struct soc_mixer_control) \

		{.reg = reg_left, .rreg = reg_right, .shift = xshift, \

		.max = xmax, .platform_max = xmax, .invert = xinvert} }

#define SOC_DOUBLE_TLV(xname, xreg, shift_left, shift_right, xmax, xinvert, tlv_array) \

#define SOC_DOUBLE_TLV(xname, reg, shift_left, shift_right, max, invert, tlv_array) \

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

	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\

		 SNDRV_CTL_ELEM_ACCESS_READWRITE,\

	.tlv.p = (tlv_array), \

	.info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \

	.put = snd_soc_put_volsw, \

	.private_value = (unsigned long)&(struct soc_mixer_control) \

		{.reg = xreg, .shift = shift_left, .rshift = shift_right,\

		 .max = xmax, .platform_max = xmax, .invert = xinvert} }

	.private_value = SOC_DOUBLE_VALUE(reg, shift_left, shift_right, \

					  max, invert) }

#define SOC_DOUBLE_R_TLV(xname, reg_left, reg_right, xshift, xmax, xinvert, tlv_array) \

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

	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
@@ -121,14 +121,13 @@ 
	.info = snd_soc_info_volsw, \

	.get = xhandler_get, .put = xhandler_put, \

	.private_value = SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) }

#define SOC_DOUBLE_EXT(xname, xreg, shift_left, shift_right, xmax, xinvert,\

#define SOC_DOUBLE_EXT(xname, reg, shift_left, shift_right, max, invert,\

	 xhandler_get, xhandler_put) \

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

	.info = snd_soc_info_volsw, \

	.get = xhandler_get, .put = xhandler_put, \

	.private_value = (unsigned long)&(struct soc_mixer_control) \

		{.reg = xreg, .shift = shift_left, .rshift = shift_right, \

		 .max = xmax, .platform_max = xmax, .invert = xinvert} }

	.private_value = \

		SOC_DOUBLE_VALUE(reg, shift_left, shift_right, max, invert) }

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

	 xhandler_get, xhandler_put, tlv_array) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
@@ -146,9 +145,8 @@ 
	.tlv.p = (tlv_array), \

	.info = snd_soc_info_volsw, \

	.get = xhandler_get, .put = xhandler_put, \

	.private_value = (unsigned long)&(struct soc_mixer_control) \

		{.reg = xreg, .shift = shift_left, .rshift = shift_right, \

		.max = xmax, .platform_max = xmax, .invert = xinvert} }

	.private_value = SOC_DOUBLE_VALUE(xreg, shift_left, shift_right, \

					  xmax, xinvert) }

#define SOC_DOUBLE_R_EXT_TLV(xname, reg_left, reg_right, xshift, xmax, xinvert,\

	 xhandler_get, xhandler_put, tlv_array) \

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