Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ALSA: ppc: 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>

+3 -8
+3 -8
sound/ppc/tumbler.c
··· 795 795 static int snapper_info_capture_source(struct snd_kcontrol *kcontrol, 796 796 struct snd_ctl_elem_info *uinfo) 797 797 { 798 - static char *texts[2] = { 798 + static const char * const texts[2] = { 799 799 "Line", "Mic" 800 800 }; 801 - uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; 802 - uinfo->count = 1; 803 - uinfo->value.enumerated.items = 2; 804 - if (uinfo->value.enumerated.item > 1) 805 - uinfo->value.enumerated.item = 1; 806 - strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); 807 - return 0; 801 + 802 + return snd_ctl_enum_info(uinfo, 1, 2, texts); 808 803 } 809 804 810 805 static int snapper_get_capture_source(struct snd_kcontrol *kcontrol,