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

Commit 69b0c762 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: es1688: Use snd_ctl_enum_info() 



... and reduce the open codes.  Also correct the array size and add
missing const.

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

sound/isa/es1688/es1688_lib.c

+2 −8
Original line number Diff line number Diff line
@@ -762,18 +762,12 @@ int snd_es1688_pcm(struct snd_card *card, struct snd_es1688 *chip, 


static int snd_es1688_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)

{

	static char *texts[9] = {

	static const char * const texts[8] = {

		"Mic", "Mic Master", "CD", "AOUT",

		"Mic1", "Mix", "Line", "Master"

	};



	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, 8, texts);

}



static int snd_es1688_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)