Commit 2a1803a7 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai
Browse files

ALSA: usb-audio: use enum control info helper 



Simplify info callbacks by using the snd_ctl_enum_info() helper function.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent bed6896d

sound/usb/midi.c

+1 −7
Original line number Diff line number Diff line
@@ -1729,13 +1729,7 @@ static int roland_load_info(struct snd_kcontrol *kcontrol, 
{

	static const char *const names[] = { "High Load", "Light Load" };



	info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	info->count = 1;

	info->value.enumerated.items = 2;

	if (info->value.enumerated.item > 1)

		info->value.enumerated.item = 1;

	strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);

	return 0;

	return snd_ctl_enum_info(info, 1, 2, names);

}



static int roland_load_get(struct snd_kcontrol *kcontrol,

sound/usb/mixer.c

+2 −9
Original line number Diff line number Diff line
@@ -1633,18 +1633,11 @@ static int parse_audio_extension_unit(struct mixer_build *state, int unitid, voi 
static int mixer_ctl_selector_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)

{

	struct usb_mixer_elem_info *cval = kcontrol->private_data;

	char **itemlist = (char **)kcontrol->private_value;

	const char **itemlist = (const char **)kcontrol->private_value;



	if (snd_BUG_ON(!itemlist))

		return -EINVAL;

	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	uinfo->count = 1;

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

	if (uinfo->value.enumerated.item >= cval->max)

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

	strlcpy(uinfo->value.enumerated.name, itemlist[uinfo->value.enumerated.item],

		sizeof(uinfo->value.enumerated.name));

	return 0;

	return snd_ctl_enum_info(uinfo, 1, cval->max, itemlist);

}



/* get callback for selector unit */