diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-10-20 12:20:07 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-10-21 03:12:51 -0400 |
commit | 3e4bc5b78e5516585941c7888287ed50a5090bf4 (patch) | |
tree | 103c1caed728154fb2656e64c18191e67ea3a3d3 | |
parent | 7298ece7a26753b073a9ce5f979a4942d3904d44 (diff) |
ALSA: sonicvibes: 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>
-rw-r--r-- | sound/pci/sonicvibes.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c index 5b0d317cc9a6..313a7328bf9c 100644 --- a/sound/pci/sonicvibes.c +++ b/sound/pci/sonicvibes.c | |||
@@ -918,17 +918,11 @@ static int snd_sonicvibes_pcm(struct sonicvibes *sonic, int device, | |||
918 | 918 | ||
919 | static int snd_sonicvibes_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) | 919 | static int snd_sonicvibes_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
920 | { | 920 | { |
921 | static char *texts[7] = { | 921 | static const char * const texts[7] = { |
922 | "CD", "PCM", "Aux1", "Line", "Aux0", "Mic", "Mix" | 922 | "CD", "PCM", "Aux1", "Line", "Aux0", "Mic", "Mix" |
923 | }; | 923 | }; |
924 | 924 | ||
925 | uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; | 925 | return snd_ctl_enum_info(uinfo, 2, 7, texts); |
926 | uinfo->count = 2; | ||
927 | uinfo->value.enumerated.items = 7; | ||
928 | if (uinfo->value.enumerated.item >= 7) | ||
929 | uinfo->value.enumerated.item = 6; | ||
930 | strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); | ||
931 | return 0; | ||
932 | } | 926 | } |
933 | 927 | ||
934 | static int snd_sonicvibes_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) | 928 | static int snd_sonicvibes_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |