tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ALSA: aw2: Use snd_ctl_enum_info()
... and reduce the open codes. Also add missing const to the text array.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
+2
-11
+2
-11
sound/pci/aw2/aw2-alsa.c
+2
-11
sound/pci/aw2/aw2-alsa.c
···
725
725
static int snd_aw2_control_switch_capture_info(struct snd_kcontrol *kcontrol,
726
726
struct snd_ctl_elem_info *uinfo)
727
727
{
728
-
static char *texts[2] = {
728
+
static const char * const texts[2] = {
729
729
"Analog", "Digital"
730
730
};
731
-
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
732
-
uinfo->count = 1;
733
-
uinfo->value.enumerated.items = 2;
734
-
if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items) {
735
-
uinfo->value.enumerated.item =
736
-
uinfo->value.enumerated.items - 1;
737
-
}
738
-
strcpy(uinfo->value.enumerated.name,
739
-
texts[uinfo->value.enumerated.item]);
740
-
return 0;
731
+
return snd_ctl_enum_info(uinfo, 1, 2, texts);
741
732
}
742
733
743
734
static int snd_aw2_control_switch_capture_get(struct snd_kcontrol *kcontrol,