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

Commit 9a953e6f authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Use snd_soc_info_enum_double() for SOC_ENUM_EXT controls 



snd_soc_info_enum_ext() and snd_soc_info_enum_double() are almost identical. The
only difference is that snd_soc_info_enum_double() is also able to handle stereo
controls. Using snd_soc_info_enum double() instead of snd_soc_info_enum_ext()
for the SOC_ENUM_EXT control's info callback allows us to remove
snd_soc_info_enum_ext().

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

include/sound/soc.h

+1 −3
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ 
	.private_value = xdata }

#define SOC_ENUM_EXT(xname, xenum, xhandler_get, xhandler_put) \

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

	.info = snd_soc_info_enum_ext, \

	.info = snd_soc_info_enum_double, \

	.get = xhandler_get, .put = xhandler_put, \

	.private_value = (unsigned long)&xenum }
@@ -485,8 +485,6 @@ int snd_soc_add_dai_controls(struct snd_soc_dai *dai, 
	const struct snd_kcontrol_new *controls, int num_controls);

int snd_soc_info_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo);

int snd_soc_info_enum_ext(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo);

int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol,

sound/soc/soc-core.c

+0 −27
Original line number Diff line number Diff line
@@ -2550,33 +2550,6 @@ int snd_soc_put_value_enum_double(struct snd_kcontrol *kcontrol, 
}

EXPORT_SYMBOL_GPL(snd_soc_put_value_enum_double);



/**

 * snd_soc_info_enum_ext - external enumerated single mixer info callback

 * @kcontrol: mixer control

 * @uinfo: control element information

 *

 * Callback to provide information about an external enumerated

 * single mixer.

 *

 * Returns 0 for success.

 */

int snd_soc_info_enum_ext(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo)

{

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;



	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	uinfo->count = 1;

	uinfo->value.enumerated.items = e->max;



	if (uinfo->value.enumerated.item > e->max - 1)

		uinfo->value.enumerated.item = e->max - 1;

	strcpy(uinfo->value.enumerated.name,

		e->texts[uinfo->value.enumerated.item]);

	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_info_enum_ext);



/**

 * snd_soc_info_volsw - single mixer info callback

 * @kcontrol: mixer control