]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ALSA: via82xx: Use snd_ctl_enum_info()
authorTakashi Iwai <tiwai@suse.de>
Mon, 20 Oct 2014 16:20:18 +0000 (18:20 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 21 Oct 2014 07:13:24 +0000 (09:13 +0200)
... and reduce the open codes.  Also add missing const to the text array.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/via82xx.c

index ecedf4dbfa2a8df51c5c5f901b765a419e453c81..e088467fb7366d3b33c751815417fe58d19dee67 100644 (file)
@@ -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,