1 files changed, 8 insertions, 38 deletions

diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c
index 3b3cf4ac9060..c9411dfff5a4 100644
--- a/sound/pci/ice1712/aureon.c
+++ b/sound/pci/ice1712/aureon.c
@@ -205,13 +205,7 @@ static int aureon_universe_inmux_info(struct snd_kcontrol *kcontrol,
         static const char * const texts[3] =
                 {"Internal Aux", "Wavetable", "Rear Line-In"};
 
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 3;
-        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, 3, texts);
 }
 
 static int aureon_universe_inmux_get(struct snd_kcontrol *kcontrol,
@@ -1106,20 +1100,10 @@ static int wm_adc_mux_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_in
         };
         struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
 
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 2;
-        if (ice->eeprom.subvendor == VT1724_SUBDEVICE_AUREON71_UNIVERSE) {
-                uinfo->value.enumerated.items = 8;
-                if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                        uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
-                strcpy(uinfo->value.enumerated.name, universe_texts[uinfo->value.enumerated.item]);
-        } else {
-                uinfo->value.enumerated.items = 5;
-                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;
+        if (ice->eeprom.subvendor == VT1724_SUBDEVICE_AUREON71_UNIVERSE)
+                return snd_ctl_enum_info(uinfo, 2, 8, universe_texts);
+        else
+                return snd_ctl_enum_info(uinfo, 2, 5, texts);
 }
 
 static int wm_adc_mux_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
@@ -1167,16 +1151,10 @@ static int aureon_cs8415_mux_info(struct snd_kcontrol *kcontrol, struct snd_ctl_
                 "CD",
                 "Coax"
         };
-        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;
         if (ice->eeprom.subvendor == VT1724_SUBDEVICE_PRODIGY71)
-                strcpy(uinfo->value.enumerated.name, prodigy_texts[uinfo->value.enumerated.item]);
+                return snd_ctl_enum_info(uinfo, 1, 2, prodigy_texts);
         else
-                strcpy(uinfo->value.enumerated.name, aureon_texts[uinfo->value.enumerated.item]);
-        return 0;
+                return snd_ctl_enum_info(uinfo, 1, 2, aureon_texts);
 }
 
 static int aureon_cs8415_mux_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
@@ -1392,15 +1370,7 @@ static int aureon_oversampling_info(struct snd_kcontrol *k, struct snd_ctl_elem_
 {
         static const char * const texts[2] = { "128x", "64x"    };
 
-        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 aureon_oversampling_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)