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

ASoC: ops: Remove snd_soc_info_volsw_range() 



The only difference between snd_soc_info_volsw() and
snd_soc_info_volsw_range() is that the later will not force a 2
value control to be of type integer if the name ends in "Volume".

The kernel currently contains no users of snd_soc_info_volsw_range()
that would return a boolean control with this code, so the risk is
quite low and it seems appropriate that it should contain volume
control detection. So remove snd_soc_info_volsw_range() and point its
users at snd_soc_info_volsw().

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


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

include/sound/soc.h

+5 −7
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 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, \

	.info = snd_soc_info_volsw, .get = snd_soc_get_volsw_range, \

	.put = snd_soc_put_volsw_range, \

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

#define SOC_SINGLE_TLV(xname, reg, shift, max, invert, tlv_array) \
@@ -90,7 +90,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 = snd_soc_get_volsw_range, .put = snd_soc_put_volsw_range, \

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

#define SOC_DOUBLE(xname, reg, shift_left, shift_right, max, invert) \
@@ -116,7 +116,7 @@ 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, \

	.info = snd_soc_info_volsw, \

	.get = snd_soc_get_volsw_range, .put = snd_soc_put_volsw_range, \

	.private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, \

					    xshift, xmin, xmax, xinvert) }
@@ -164,7 +164,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 = snd_soc_get_volsw_range, .put = snd_soc_put_volsw_range, \

	.private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, \

					    xshift, xmin, xmax, xinvert) }
@@ -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,8 +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,

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/soc-ops.c

+3 −33
Original line number Diff line number Diff line
@@ -169,12 +169,12 @@ static int soc_mixer_sx_mask(struct soc_mixer_control *mc) 
}



/**

 * snd_soc_info_volsw - single mixer info callback

 * snd_soc_info_volsw - single mixer info callback with range.

 * @kcontrol: mixer control

 * @uinfo: control element information

 *

 * Callback to provide information about a single mixer control, or a double

 * mixer control that spans 2 registers.

 * Callback to provide information, with a range, about a single mixer control,

 * or a double mixer control that spans 2 registers.

 *

 * Returns 0 for success.

 */
@@ -450,36 +450,6 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, 
}

EXPORT_SYMBOL_GPL(snd_soc_put_volsw_sx);



/**

 * snd_soc_info_volsw_range - single mixer info callback with range.

 * @kcontrol: mixer control

 * @uinfo: control element information

 *

 * Callback to provide information, within a range, about a single

 * mixer control.

 *

 * returns 0 for success.

 */

int snd_soc_info_volsw_range(struct snd_kcontrol *kcontrol,

			     struct snd_ctl_elem_info *uinfo)

{

	struct soc_mixer_control *mc =

		(struct soc_mixer_control *)kcontrol->private_value;

	int max;



	max = mc->max - mc->min;

	if (mc->platform_max && mc->platform_max < max)

		max = mc->platform_max;



	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;

	uinfo->count = snd_soc_volsw_is_stereo(mc) ? 2 : 1;

	uinfo->value.integer.min = 0;

	uinfo->value.integer.max = max;



	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_info_volsw_range);



/**

 * snd_soc_put_volsw_range - single mixer put value callback with range.

 * @kcontrol: mixer control

sound/soc/soc-topology.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static const struct snd_soc_tplg_kcontrol_ops io_ops[] = { 
	{SND_SOC_TPLG_CTL_BYTES, snd_soc_bytes_get,

		snd_soc_bytes_put, snd_soc_bytes_info},

	{SND_SOC_TPLG_CTL_RANGE, snd_soc_get_volsw_range,

		snd_soc_put_volsw_range, snd_soc_info_volsw_range},

		snd_soc_put_volsw_range, snd_soc_info_volsw},

	{SND_SOC_TPLG_CTL_VOLSW_XR_SX, snd_soc_get_xr_sx,

		snd_soc_put_xr_sx, snd_soc_info_xr_sx},

	{SND_SOC_TPLG_CTL_STROBE, snd_soc_get_strobe,