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

ALSA: pcxhr: Use snd_ctl_enum_info()

... and reduce the open codes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

Takashi Iwai 08455ace f861237c

+2 -16
+2 -16
sound/pci/pcxhr/pcxhr_mixer.c
··· 660 660 if (chip->mgr->board_has_mic) 661 661 i = 5; /* Mic and MicroMix available */ 662 662 } 663 - uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; 664 - uinfo->count = 1; 665 - uinfo->value.enumerated.items = i; 666 - if (uinfo->value.enumerated.item > (i-1)) 667 - uinfo->value.enumerated.item = i-1; 668 - strcpy(uinfo->value.enumerated.name, 669 - texts[uinfo->value.enumerated.item]); 670 - return 0; 663 + return snd_ctl_enum_info(uinfo, 1, i, texts); 671 664 } 672 665 673 666 static int pcxhr_audio_src_get(struct snd_kcontrol *kcontrol, ··· 749 756 texts = textsPCXHR; 750 757 snd_BUG_ON(clock_items > (PCXHR_CLOCK_TYPE_MAX+1)); 751 758 } 752 - uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; 753 - uinfo->count = 1; 754 - uinfo->value.enumerated.items = clock_items; 755 - if (uinfo->value.enumerated.item >= clock_items) 756 - uinfo->value.enumerated.item = clock_items-1; 757 - strcpy(uinfo->value.enumerated.name, 758 - texts[uinfo->value.enumerated.item]); 759 - return 0; 759 + return snd_ctl_enum_info(uinfo, 1, clock_items, texts); 760 760 } 761 761 762 762 static int pcxhr_clock_type_get(struct snd_kcontrol *kcontrol,