ALSA: vx: Use snd_ctl_elem_info()

... and reduce the open codes.  Also add missing const to text arrays.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/drivers/vx/vx_mixer.c b/sound/drivers/vx/vx_mixer.c
index 3b6823fc0606537d6659b2bb5541eb88165d1349..be9477e3073913b777839a053f8bf97343c95fa3 100644 (file)
--- a/sound/drivers/vx/vx_mixer.c
+++ b/sound/drivers/vx/vx_mixer.c
@@ -471,30 +471,18 @@ static struct snd_kcontrol_new vx_control_output_level = {
  */
 static int vx_audio_src_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-       static char *texts_mic[3] = {
+       static const char * const texts_mic[3] = {
                "Digital", "Line", "Mic"
        };
-       static char *texts_vx2[2] = {
+       static const char * const texts_vx2[2] = {
                "Digital", "Analog"
        };
        struct vx_core *chip = snd_kcontrol_chip(kcontrol);
 
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-       uinfo->count = 1;
-       if (chip->type >= VX_TYPE_VXPOCKET) {
-               uinfo->value.enumerated.items = 3;
-               if (uinfo->value.enumerated.item > 2)
-                       uinfo->value.enumerated.item = 2;
-               strcpy(uinfo->value.enumerated.name,
-                      texts_mic[uinfo->value.enumerated.item]);
-       } else {
-               uinfo->value.enumerated.items = 2;
-               if (uinfo->value.enumerated.item > 1)
-                       uinfo->value.enumerated.item = 1;
-               strcpy(uinfo->value.enumerated.name,
-                      texts_vx2[uinfo->value.enumerated.item]);
-       }
-       return 0;
+       if (chip->type >= VX_TYPE_VXPOCKET)
+               return snd_ctl_enum_info(uinfo, 1, 3, texts_mic);
+       else
+               return snd_ctl_enum_info(uinfo, 1, 2, texts_vx2);
 }
 
 static int vx_audio_src_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
@@ -539,18 +527,11 @@ static struct snd_kcontrol_new vx_control_audio_src = {
  */
 static int vx_clock_mode_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-       static char *texts[3] = {
+       static const char * const texts[3] = {
                "Auto", "Internal", "External"
        };
 
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-       uinfo->count = 1;
-       uinfo->value.enumerated.items = 3;
-       if (uinfo->value.enumerated.item > 2)
-               uinfo->value.enumerated.item = 2;
-       strcpy(uinfo->value.enumerated.name,
-              texts[uinfo->value.enumerated.item]);
-       return 0;
+       return snd_ctl_enum_info(uinfo, 1, 3, texts);
 }
 
 static int vx_clock_mode_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)