Unverified Commit 47c4f9b1 authored by Mark Brown's avatar Mark Brown
Browse files

Tidy up ASoC control get and put handlers 

Merge series from Charles Keepax <ckeepax@opensource.cirrus.com>:

There is a lot of duplicated and occasionally slightly incorrect code
around the ASoC control get and put handlers. This series add some kunit
tests and then refactors the code to get all the tests passing and
reduce some of the duplication. The focus here is on the volsw handlers,
future work could still be done on some of the others but these were the
ones that most required attention.

Hopefully the only slightly controversal change is the very last patch
which changes platform_max to be applied after the control type is
determined, more discussion in the commit message for that one.
parents 83eddf01 502a668f

include/sound/soc.h

+9 −15
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ struct platform_device; 
	.private_value = SOC_SINGLE_VALUE(reg, shift, 0, max, invert, 0) }

#define SOC_SINGLE_RANGE(xname, xreg, xshift, xmin, xmax, xinvert) \

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

	.info = snd_soc_info_volsw_range, .get = snd_soc_get_volsw_range, \

	.put = snd_soc_put_volsw_range, \

	.info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \

	.put = snd_soc_put_volsw, \

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

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

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
@@ -90,8 +90,8 @@ struct platform_device; 
	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\

		 SNDRV_CTL_ELEM_ACCESS_READWRITE,\

	.tlv.p = (tlv_array), \

	.info = snd_soc_info_volsw_range, \

	.get = snd_soc_get_volsw_range, .put = snd_soc_put_volsw_range, \

	.info = snd_soc_info_volsw, \

	.get = snd_soc_get_volsw, .put = snd_soc_put_volsw, \

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

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

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
@@ -116,8 +116,8 @@ struct platform_device; 
#define SOC_DOUBLE_R_RANGE(xname, reg_left, reg_right, xshift, xmin, \

			   xmax, xinvert)		\

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

	.info = snd_soc_info_volsw_range, \

	.get = snd_soc_get_volsw_range, .put = snd_soc_put_volsw_range, \

	.info = snd_soc_info_volsw, \

	.get = snd_soc_get_volsw, .put = snd_soc_put_volsw, \

	.private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, \

					    xshift, xmin, xmax, xinvert) }

#define SOC_DOUBLE_TLV(xname, reg, shift_left, shift_right, max, invert, tlv_array) \
@@ -164,8 +164,8 @@ struct platform_device; 
	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\

		 SNDRV_CTL_ELEM_ACCESS_READWRITE,\

	.tlv.p = (tlv_array), \

	.info = snd_soc_info_volsw_range, \

	.get = snd_soc_get_volsw_range, .put = snd_soc_put_volsw_range, \

	.info = snd_soc_info_volsw, \

	.get = snd_soc_get_volsw, .put = snd_soc_put_volsw, \

	.private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, \

					    xshift, xmin, xmax, xinvert) }

#define SOC_DOUBLE_R_SX_TLV(xname, xreg, xrreg, xshift, xmin, xmax, tlv_array) \
@@ -266,7 +266,7 @@ struct platform_device; 
	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\

		 SNDRV_CTL_ELEM_ACCESS_READWRITE,\

	.tlv.p = (tlv_array), \

	.info = snd_soc_info_volsw_range, \

	.info = snd_soc_info_volsw, \

	.get = xhandler_get, .put = xhandler_put, \

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

#define SOC_DOUBLE_EXT_TLV(xname, xreg, shift_left, shift_right, xmax, xinvert,\
@@ -569,12 +569,6 @@ int snd_soc_get_volsw_sx(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_value *ucontrol);

int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_info_volsw_range(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo);

int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_get_volsw_range(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_limit_volume(struct snd_soc_card *card,

	const char *name, int max);

int snd_soc_bytes_info(struct snd_kcontrol *kcontrol,

sound/pci/hda/tas2781_hda_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\

		 SNDRV_CTL_ELEM_ACCESS_READWRITE,\

	.tlv.p = (tlv_array), \

	.info = snd_soc_info_volsw_range, \

	.info = snd_soc_info_volsw, \

	.get = xhandler_get, .put = xhandler_put, \

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

		{.reg = xreg, .rreg = xreg, .shift = xshift, \

sound/pci/hda/tas2781_hda_spi.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \

		SNDRV_CTL_ELEM_ACCESS_READWRITE, \

	.tlv.p = (tlv_array), \

	.info = snd_soc_info_volsw_range, \

	.info = snd_soc_info_volsw, \

	.get = xhandler_get, .put = xhandler_put, \

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

		.reg = xreg, .rreg = xreg, \

sound/soc/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -81,6 +81,13 @@ config SND_SOC_UTILS_KUNIT_TEST 
	help

	  If you want to perform tests on ALSA SoC utils library say Y here.



config SND_SOC_OPS_KUNIT_TEST

	tristate "KUnit tests for SoC ops"

	depends on KUNIT

	default KUNIT_ALL_TESTS

	help

	  If you want to perform tests on ALSA SoC ops library say Y here.



config SND_SOC_ACPI

	tristate

sound/soc/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ ifneq ($(CONFIG_SND_SOC_UTILS_KUNIT_TEST),) 
obj-$(CONFIG_SND_SOC_UTILS_KUNIT_TEST) += soc-utils-test.o

endif



ifneq ($(CONFIG_SND_SOC_OPS_KUNIT_TEST),)

obj-$(CONFIG_SND_SOC_OPS_KUNIT_TEST) += soc-ops-test.o

endif



ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),)

snd-soc-core-y += soc-generic-dmaengine-pcm.o

endif