diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-10-20 12:20:18 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-10-21 03:13:24 -0400 |
commit | 9883ab91e3ba5229bfe2d6e7f6ff497a2d03d4d2 (patch) | |
tree | 3ef271bb06b0b80d9f7f28d779254a5bf3e2f296 /sound/pci/via82xx.c | |
parent | 3e4bc5b78e5516585941c7888287ed50a5090bf4 (diff) |
ALSA: via82xx: 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/via82xx.c')
-rw-r--r-- | sound/pci/via82xx.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index ecedf4dbfa2a..e088467fb736 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c | |||
@@ -1610,16 +1610,10 @@ static int snd_via8233_capture_source_info(struct snd_kcontrol *kcontrol, | |||
1610 | /* formerly they were "Line" and "Mic", but it looks like that they | 1610 | /* formerly they were "Line" and "Mic", but it looks like that they |
1611 | * have nothing to do with the actual physical connections... | 1611 | * have nothing to do with the actual physical connections... |
1612 | */ | 1612 | */ |
1613 | static char *texts[2] = { | 1613 | static const char * const texts[2] = { |
1614 | "Input1", "Input2" | 1614 | "Input1", "Input2" |
1615 | }; | 1615 | }; |
1616 | uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; | 1616 | return snd_ctl_enum_info(uinfo, 1, 2, texts); |
1617 | uinfo->count = 1; | ||
1618 | uinfo->value.enumerated.items = 2; | ||
1619 | if (uinfo->value.enumerated.item >= 2) | ||
1620 | uinfo->value.enumerated.item = 1; | ||
1621 | strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); | ||
1622 | return 0; | ||
1623 | } | 1617 | } |
1624 | 1618 | ||
1625 | static int snd_via8233_capture_source_get(struct snd_kcontrol *kcontrol, | 1619 | static int snd_via8233_capture_source_get(struct snd_kcontrol *kcontrol, |