diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-10-20 12:16:01 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-10-21 02:53:43 -0400 |
commit | 4d765e48c5edb2090b82e97680b2d1ddf6d18c31 (patch) | |
tree | 5dd08b49a83ace0d6aa41a5a77b60bbaf0266504 /sound/pci/aw2 | |
parent | 30d0ae425ab1c9bb0003c3798de78fbf30ddebdc (diff) |
ALSA: aw2: 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>
Diffstat (limited to 'sound/pci/aw2')
-rw-r--r-- | sound/pci/aw2/aw2-alsa.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c index 3878cf5de9a4..e1cf01949fda 100644 --- a/sound/pci/aw2/aw2-alsa.c +++ b/sound/pci/aw2/aw2-alsa.c | |||
@@ -725,19 +725,10 @@ static int snd_aw2_new_pcm(struct aw2 *chip) | |||
725 | static int snd_aw2_control_switch_capture_info(struct snd_kcontrol *kcontrol, | 725 | static int snd_aw2_control_switch_capture_info(struct snd_kcontrol *kcontrol, |
726 | struct snd_ctl_elem_info *uinfo) | 726 | struct snd_ctl_elem_info *uinfo) |
727 | { | 727 | { |
728 | static char *texts[2] = { | 728 | static const char * const texts[2] = { |
729 | "Analog", "Digital" | 729 | "Analog", "Digital" |
730 | }; | 730 | }; |
731 | uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; | 731 | return snd_ctl_enum_info(uinfo, 1, 2, texts); |
732 | uinfo->count = 1; | ||
733 | uinfo->value.enumerated.items = 2; | ||
734 | if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items) { | ||
735 | uinfo->value.enumerated.item = | ||
736 | uinfo->value.enumerated.items - 1; | ||
737 | } | ||
738 | strcpy(uinfo->value.enumerated.name, | ||
739 | texts[uinfo->value.enumerated.item]); | ||
740 | return 0; | ||
741 | } | 732 | } |
742 | 733 | ||
743 | static int snd_aw2_control_switch_capture_get(struct snd_kcontrol *kcontrol, | 734 | static int snd_aw2_control_switch_capture_get(struct snd_kcontrol *kcontrol, |