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

Commit 7bbd03e0 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb-audio: Use snd_ctl_enum_info() 



... and reduce the open codes.  Also add missing const to text arrays.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c8dd33fc

sound/usb/mixer_quirks.c

+6 −29
Original line number Diff line number Diff line
@@ -437,19 +437,9 @@ static void snd_audigy2nx_proc_read(struct snd_info_entry *entry, 
static int snd_emu0204_ch_switch_info(struct snd_kcontrol *kcontrol,

				      struct snd_ctl_elem_info *uinfo)

{

	static const char *texts[2] = {"1/2",

				       "3/4"

	};



	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	uinfo->count = 1;

	uinfo->value.enumerated.items = 2;

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

		uinfo->value.enumerated.item = 1;

	strcpy(uinfo->value.enumerated.name,

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

	static const char * const texts[2] = {"1/2", "3/4"};



	return 0;

	return snd_ctl_enum_info(uinfo, 1, ARRAY_SIZE(texts), texts);

}



static int snd_emu0204_ch_switch_get(struct snd_kcontrol *kcontrol,
@@ -735,25 +725,12 @@ struct snd_ftu_eff_switch_priv_val { 
static int snd_ftu_eff_switch_info(struct snd_kcontrol *kcontrol,

					struct snd_ctl_elem_info *uinfo)

{

	static const char *texts[8] = {"Room 1",

				       "Room 2",

				       "Room 3",

				       "Hall 1",

				       "Hall 2",

				       "Plate",

				       "Delay",

				       "Echo"

	static const char *const texts[8] = {

		"Room 1", "Room 2", "Room 3", "Hall 1",

		"Hall 2", "Plate", "Delay", "Echo"

	};



	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	uinfo->count = 1;

	uinfo->value.enumerated.items = 8;

	if (uinfo->value.enumerated.item > 7)

		uinfo->value.enumerated.item = 7;

	strcpy(uinfo->value.enumerated.name,

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



	return 0;

	return snd_ctl_enum_info(uinfo, 1, ARRAY_SIZE(texts), texts);

}



static int snd_ftu_eff_switch_get(struct snd_kcontrol *kctl,