ALSA: pcxhr: Use snd_ctl_enum_info()
authorTakashi Iwai <tiwai@suse.de>
Mon, 20 Oct 2014 16:19:00 +0000 (18:19 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 21 Oct 2014 07:04:18 +0000 (09:04 +0200)
... and reduce the open codes.

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

index 95c9571780d8ca5da2df9b28408fb78c8325db38..63136c4f3f3d29cd3aa449f7a278d3bf45df6b98 100644 (file)
@@ -660,14 +660,7 @@ static int pcxhr_audio_src_info(struct snd_kcontrol *kcontrol,
                if (chip->mgr->board_has_mic)
                        i = 5;  /* Mic and MicroMix available */
        }
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-       uinfo->count = 1;
-       uinfo->value.enumerated.items = i;
-       if (uinfo->value.enumerated.item > (i-1))
-               uinfo->value.enumerated.item = i-1;
-       strcpy(uinfo->value.enumerated.name,
-               texts[uinfo->value.enumerated.item]);
-       return 0;
+       return snd_ctl_enum_info(uinfo, 1, i, texts);
 }
 
 static int pcxhr_audio_src_get(struct snd_kcontrol *kcontrol,
@@ -756,14 +749,7 @@ static int pcxhr_clock_type_info(struct snd_kcontrol *kcontrol,
                texts = textsPCXHR;
                snd_BUG_ON(clock_items > (PCXHR_CLOCK_TYPE_MAX+1));
        }
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-       uinfo->count = 1;
-       uinfo->value.enumerated.items = clock_items;
-       if (uinfo->value.enumerated.item >= clock_items)
-               uinfo->value.enumerated.item = clock_items-1;
-       strcpy(uinfo->value.enumerated.name,
-               texts[uinfo->value.enumerated.item]);
-       return 0;
+       return snd_ctl_enum_info(uinfo, 1, clock_items, texts);
 }
 
 static int pcxhr_clock_type_get(struct snd_kcontrol *kcontrol,
This page took 0.027958 seconds and 5 git commands to generate.