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

Commit 4d765e48 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: aw2: Use snd_ctl_enum_info() 



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

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

sound/pci/aw2/aw2-alsa.c

+2 −11
Original line number Original line Diff line number Diff line
@@ -725,19 +725,10 @@ static int snd_aw2_new_pcm(struct aw2 *chip) 
static int snd_aw2_control_switch_capture_info(struct snd_kcontrol *kcontrol,

static int snd_aw2_control_switch_capture_info(struct snd_kcontrol *kcontrol,

					       struct snd_ctl_elem_info *uinfo)

					       struct snd_ctl_elem_info *uinfo)

{

{

	static char *texts[2] = {

	static const char * const texts[2] = {

		"Analog", "Digital"

		"Analog", "Digital"

	};

	};

	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

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

	uinfo->count = 1;

	uinfo->value.enumerated.items = 2;

	if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items) {

		uinfo->value.enumerated.item =

		    uinfo->value.enumerated.items - 1;

	}

	strcpy(uinfo->value.enumerated.name,

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

	return 0;

}

}





static int snd_aw2_control_switch_capture_get(struct snd_kcontrol *kcontrol,

static int snd_aw2_control_switch_capture_get(struct snd_kcontrol *kcontrol,