diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-10-20 12:13:39 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-10-21 02:30:40 -0400 |
commit | 1da0c47779840d038583ea6fa4e3497939d6ea21 (patch) | |
tree | 5249df32358760674390e65dc0672c05d72ba403 /sound/isa | |
parent | 609e478b40aceaa07d14f1bada02a3874bac2c45 (diff) |
ALSA: ad1816a: 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/isa')
-rw-r--r-- | sound/isa/ad1816a/ad1816a_lib.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c index f0fd98e695e3..01a07986f4a3 100644 --- a/sound/isa/ad1816a/ad1816a_lib.c +++ b/sound/isa/ad1816a/ad1816a_lib.c | |||
@@ -731,18 +731,12 @@ int snd_ad1816a_timer(struct snd_ad1816a *chip, int device, | |||
731 | 731 | ||
732 | static int snd_ad1816a_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) | 732 | static int snd_ad1816a_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
733 | { | 733 | { |
734 | static char *texts[8] = { | 734 | static const char * const texts[8] = { |
735 | "Line", "Mix", "CD", "Synth", "Video", | 735 | "Line", "Mix", "CD", "Synth", "Video", |
736 | "Mic", "Phone", | 736 | "Mic", "Phone", |
737 | }; | 737 | }; |
738 | 738 | ||
739 | uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; | 739 | return snd_ctl_enum_info(uinfo, 2, 7, texts); |
740 | uinfo->count = 2; | ||
741 | uinfo->value.enumerated.items = 7; | ||
742 | if (uinfo->value.enumerated.item > 6) | ||
743 | uinfo->value.enumerated.item = 6; | ||
744 | strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); | ||
745 | return 0; | ||
746 | } | 740 | } |
747 | 741 | ||
748 | static int snd_ad1816a_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) | 742 | static int snd_ad1816a_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |