lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: cmipci: use enum control info helper

Browse Source 
Simplify info callbacks by using the snd_ctl_enum_info() helper function.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Clemens Ladisch
2011-01-10 16:28:19 +01:00
committed by Takashi Iwai
parent dd1224aa3e
commit 60c4ce4a0c
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sound/pci/cmipci.c
View File

@@ -2507,14 +2507,12 @@ static int snd_cmipci_line_in_mode_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo) struct snd_ctl_elem_info *uinfo)
{ {
struct cmipci *cm = snd_kcontrol_chip(kcontrol); struct cmipci *cm = snd_kcontrol_chip(kcontrol);
static char *texts[3] = { "Line-In", "Rear Output", "Bass Output" }; static const char *const texts[3] = {
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; "Line-In", "Rear Output", "Bass Output"
uinfo->count = 1; };
uinfo->value.enumerated.items = cm->chip_version >= 39 ? 3 : 2;
if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items) return snd_ctl_enum_info(uinfo, 1,
uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1; cm->chip_version >= 39 ? 3 : 2, texts);
strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
return 0;
} }
static inline unsigned int get_line_in_mode(struct cmipci *cm) static inline unsigned int get_line_in_mode(struct cmipci *cm)
@@ -2564,14 +2562,9 @@ static int snd_cmipci_line_in_mode_put(struct snd_kcontrol *kcontrol,
static int snd_cmipci_mic_in_mode_info(struct snd_kcontrol *kcontrol, static int snd_cmipci_mic_in_mode_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo) struct snd_ctl_elem_info *uinfo)
{ {
static char *texts[2] = { "Mic-In", "Center/LFE Output" }; static const char *const texts[2] = { "Mic-In", "Center/LFE Output" };
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
uinfo->count = 1; return snd_ctl_enum_info(uinfo, 1, 2, texts);
uinfo->value.enumerated.items = 2;
if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
return 0;
} }
static int snd_cmipci_mic_in_mode_get(struct snd_kcontrol *kcontrol, static int snd_cmipci_mic_in_mode_get(struct snd_kcontrol *kcontrol,