evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALSA: msnd: Use snd_ctl_enum_info()

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

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2014-10-20 18:14:41 +02:00
parent 4e28350a8c
commit 8edd2d120b
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sound/isa/msnd/msnd_pinnacle_mixer.c
View file

@ -55,20 +55,13 @@
static int snd_msndmix_info_mux(struct snd_kcontrol *kcontrol, static int snd_msndmix_info_mux(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo) struct snd_ctl_elem_info *uinfo)
{ {
static char *texts[3] = { static const char * const texts[3] = {
"Analog", "MASS", "SPDIF", "Analog", "MASS", "SPDIF",
}; };
struct snd_msnd *chip = snd_kcontrol_chip(kcontrol); struct snd_msnd *chip = snd_kcontrol_chip(kcontrol);
unsigned items = test_bit(F_HAVEDIGITAL, &chip->flags) ? 3 : 2; unsigned items = test_bit(F_HAVEDIGITAL, &chip->flags) ? 3 : 2;
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; return snd_ctl_enum_info(uinfo, 1, items, texts);
uinfo->count = 1;
uinfo->value.enumerated.items = items;
if (uinfo->value.enumerated.item >= items)
uinfo->value.enumerated.item = items - 1;
strcpy(uinfo->value.enumerated.name,
texts[uinfo->value.enumerated.item]);
return 0;
} }
static int snd_msndmix_get_mux(struct snd_kcontrol *kcontrol, static int snd_msndmix_get_mux(struct snd_kcontrol *kcontrol,