korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-05 01:54:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: pcxhr: Use snd_ctl_enum_info()

Browse Source 
... and reduce the open codes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2014-10-20 18:19:00 +02:00
parent f861237c80
commit 08455ace3c
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sound/pci/pcxhr/pcxhr_mixer.c
View File

@ -660,14 +660,7 @@ static int pcxhr_audio_src_info(struct snd_kcontrol *kcontrol,
if (chip->mgr->board_has_mic) if (chip->mgr->board_has_mic)
i = 5; /* Mic and MicroMix available */ i = 5; /* Mic and MicroMix available */
} }
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; return snd_ctl_enum_info(uinfo, 1, i, texts);
uinfo->count = 1;
uinfo->value.enumerated.items = i;
if (uinfo->value.enumerated.item > (i-1))
uinfo->value.enumerated.item = i-1;
strcpy(uinfo->value.enumerated.name,
texts[uinfo->value.enumerated.item]);
return 0;
} }
static int pcxhr_audio_src_get(struct snd_kcontrol *kcontrol, static int pcxhr_audio_src_get(struct snd_kcontrol *kcontrol,
@ -756,14 +749,7 @@ static int pcxhr_clock_type_info(struct snd_kcontrol *kcontrol,
texts = textsPCXHR; texts = textsPCXHR;
snd_BUG_ON(clock_items > (PCXHR_CLOCK_TYPE_MAX+1)); snd_BUG_ON(clock_items > (PCXHR_CLOCK_TYPE_MAX+1));
} }
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; return snd_ctl_enum_info(uinfo, 1, clock_items, texts);
uinfo->count = 1;
uinfo->value.enumerated.items = clock_items;
if (uinfo->value.enumerated.item >= clock_items)
uinfo->value.enumerated.item = clock_items-1;
strcpy(uinfo->value.enumerated.name,
texts[uinfo->value.enumerated.item]);
return 0;
} }
static int pcxhr_clock_type_get(struct snd_kcontrol *kcontrol, static int pcxhr_clock_type_get(struct snd_kcontrol *kcontrol,