diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-20 18:20:18 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-21 09:13:24 +0200 |
| commit | 9883ab91e3ba5229bfe2d6e7f6ff497a2d03d4d2 (patch) | |
| tree | 3ef271bb06b0b80d9f7f28d779254a5bf3e2f296 | |
| parent | 3e4bc5b78e5516585941c7888287ed50a5090bf4 (diff) | |
| download | linux-stable-9883ab91e3ba5229bfe2d6e7f6ff497a2d03d4d2.tar.gz linux-stable-9883ab91e3ba5229bfe2d6e7f6ff497a2d03d4d2.tar.bz2 linux-stable-9883ab91e3ba5229bfe2d6e7f6ff497a2d03d4d2.zip | |
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>
| -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, /* formerly they were "Line" and "Mic", but it looks like that they * have nothing to do with the actual physical connections... */ - static char *texts[2] = { + static const char * const texts[2] = { "Input1", "Input2" }; - uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; - uinfo->count = 1; - uinfo->value.enumerated.items = 2; - if (uinfo->value.enumerated.item >= 2) - uinfo->value.enumerated.item = 1; - strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); - return 0; + return snd_ctl_enum_info(uinfo, 1, 2, texts); } static int snd_via8233_capture_source_get(struct snd_kcontrol *kcontrol, |