ALSA: parisc: Use snd_ctl_enum_info()
authorTakashi Iwai <tiwai@suse.de>
Mon, 20 Oct 2014 16:15:26 +0000 (18:15 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 21 Oct 2014 06:37:36 +0000 (08:37 +0200)
... and reduce the open codes.  Also add missing const to the text array.

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

index 4b20be79c1ddbb58b2712a03db08227afd5a12ef..29604a239c4447b82d14541c5337a62dc10e6f21 100644 (file)
@@ -776,15 +776,9 @@ static int
 snd_harmony_captureroute_info(struct snd_kcontrol *kc, 
                              struct snd_ctl_elem_info *uinfo)
 {
-       static char *texts[2] = { "Line", "Mic" };
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-       uinfo->count = 1;
-       uinfo->value.enumerated.items = 2;
-       if (uinfo->value.enumerated.item > 1)
-               uinfo->value.enumerated.item = 1;
-       strcpy(uinfo->value.enumerated.name,
-              texts[uinfo->value.enumerated.item]);
-       return 0;
+       static const char * const texts[2] = { "Line", "Mic" };
+
+       return snd_ctl_enum_info(uinfo, 1, 2, texts);
 }
 
 static int