ALSA: ad1816a: Use snd_ctl_enum_info()

[sfrench/cifs-2.6.git] / sound / isa / ad1816a / ad1816a_lib.c

diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c
index f0fd98e695e323bdcf1525ba0c038b0f2c358496..01a07986f4a3dcffb89aa8b7d00338616f73c864 100644 (file)
--- a/sound/isa/ad1816a/ad1816a_lib.c
+++ b/sound/isa/ad1816a/ad1816a_lib.c
@@ -731,18 +731,12 @@ int snd_ad1816a_timer(struct snd_ad1816a *chip, int device,
 
 static int snd_ad1816a_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-       static char *texts[8] = {
+       static const char * const texts[8] = {
                "Line", "Mix", "CD", "Synth", "Video",
                "Mic", "Phone",
        };
 
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-       uinfo->count = 2;
-       uinfo->value.enumerated.items = 7;
-       if (uinfo->value.enumerated.item > 6)
-               uinfo->value.enumerated.item = 6;
-       strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
-       return 0;
+       return snd_ctl_enum_info(uinfo, 2, 7, texts);
 }
 
 static int snd_ad1816a_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)