diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-10-20 12:14:07 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-10-21 02:31:36 -0400 |
commit | 69b0c762cfd4c5e86a5b1fc0074889881b859c4a (patch) | |
tree | 82b385ee9bed39724d06dae198bb2cef02aae998 /sound/isa | |
parent | 1da0c47779840d038583ea6fa4e3497939d6ea21 (diff) |
ALSA: es1688: Use snd_ctl_enum_info()
... and reduce the open codes. Also correct the array size and add
missing const.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa')
-rw-r--r-- | sound/isa/es1688/es1688_lib.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c index b3b4f15e45ba..de810e484bdf 100644 --- a/sound/isa/es1688/es1688_lib.c +++ b/sound/isa/es1688/es1688_lib.c | |||
@@ -762,18 +762,12 @@ int snd_es1688_pcm(struct snd_card *card, struct snd_es1688 *chip, | |||
762 | 762 | ||
763 | static int snd_es1688_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) | 763 | static int snd_es1688_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
764 | { | 764 | { |
765 | static char *texts[9] = { | 765 | static const char * const texts[8] = { |
766 | "Mic", "Mic Master", "CD", "AOUT", | 766 | "Mic", "Mic Master", "CD", "AOUT", |
767 | "Mic1", "Mix", "Line", "Master" | 767 | "Mic1", "Mix", "Line", "Master" |
768 | }; | 768 | }; |
769 | 769 | ||
770 | uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; | 770 | return snd_ctl_enum_info(uinfo, 1, 8, texts); |
771 | uinfo->count = 1; | ||
772 | uinfo->value.enumerated.items = 8; | ||
773 | if (uinfo->value.enumerated.item > 7) | ||
774 | uinfo->value.enumerated.item = 7; | ||
775 | strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); | ||
776 | return 0; | ||
777 | } | 771 | } |
778 | 772 | ||
779 | static int snd_es1688_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) | 773 | static int snd_es1688_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |