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

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

index 3878cf5de9a48449d9a2a2e42baa1a07ea4ea217..e1cf01949fda7a2959388e1d64c2309566496394 100644 (file)
@@ -725,19 +725,10 @@ static int snd_aw2_new_pcm(struct aw2 *chip)
 static int snd_aw2_control_switch_capture_info(struct snd_kcontrol *kcontrol,
                                               struct snd_ctl_elem_info *uinfo)
 {
-       static char *texts[2] = {
+       static const char * const texts[2] = {
                "Analog", "Digital"
        };
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-       uinfo->count = 1;
-       uinfo->value.enumerated.items = 2;
-       if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items) {
-               uinfo->value.enumerated.item =
-                   uinfo->value.enumerated.items - 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_aw2_control_switch_capture_get(struct snd_kcontrol *kcontrol,