1 files changed, 13 insertions, 20 deletions

diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 329968edca9b..f4e573555da3 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -73,7 +73,7 @@ MODULE_PARM_DESC(mpu_port, "MPU-401 port.");
 module_param_array(fm_port, long, NULL, 0444);
 MODULE_PARM_DESC(fm_port, "FM port.");
 module_param_array(soft_ac3, bool, NULL, 0444);
-MODULE_PARM_DESC(soft_ac3, "Sofware-conversion of raw SPDIF packets (model 033 only).");
+MODULE_PARM_DESC(soft_ac3, "Software-conversion of raw SPDIF packets (model 033 only).");
 #ifdef SUPPORT_JOYSTICK
 module_param_array(joystick_port, int, NULL, 0444);
 MODULE_PARM_DESC(joystick_port, "Joystick port address.");
@@ -656,8 +656,8 @@ out:
 }
 
 /*
- * Program pll register bits, I assume that the 8 registers 0xf8 upto 0xff
- * are mapped onto the 8 ADC/DAC sampling frequency which can be choosen
+ * Program pll register bits, I assume that the 8 registers 0xf8 up to 0xff
+ * are mapped onto the 8 ADC/DAC sampling frequency which can be chosen
  * at the register CM_REG_FUNCTRL1 (0x04).
  * Problem: other ways are also possible (any information about that?)
  */
@@ -666,7 +666,7 @@ static void snd_cmipci_set_pll(struct cmipci *cm, unsigned int rate, unsigned in
         unsigned int reg = CM_REG_PLL + slot;
         /*
          * Guess that this programs at reg. 0x04 the pos 15:13/12:10
-         * for DSFC/ASFC (000 upto 111).
+         * for DSFC/ASFC (000 up to 111).
          */
 
         /* FIXME: Init (Do we've to set an other register first before programming?) */
@@ -2507,14 +2507,12 @@ static int snd_cmipci_line_in_mode_info(struct snd_kcontrol *kcontrol,
                                         struct snd_ctl_elem_info *uinfo)
 {
         struct cmipci *cm = snd_kcontrol_chip(kcontrol);
-        static char *texts[3] = { "Line-In", "Rear Output", "Bass Output" };
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = cm->chip_version >= 39 ? 3 : 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;
+        static const char *const texts[3] = {
+                "Line-In", "Rear Output", "Bass Output"
+        };
+
+        return snd_ctl_enum_info(uinfo, 1,
+                                 cm->chip_version >= 39 ? 3 : 2, texts);
 }
 
 static inline unsigned int get_line_in_mode(struct cmipci *cm)
@@ -2564,14 +2562,9 @@ static int snd_cmipci_line_in_mode_put(struct snd_kcontrol *kcontrol,
 static int snd_cmipci_mic_in_mode_info(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[2] = { "Mic-In", "Center/LFE Output" };
-        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;
+        static const char *const texts[2] = { "Mic-In", "Center/LFE Output" };
+
+        return snd_ctl_enum_info(uinfo, 1, 2, texts);
 }
 
 static int snd_cmipci_mic_in_mode_get(struct snd_kcontrol *kcontrol,