1 files changed, 30 insertions, 41 deletions

diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 63e4871e5d8f..760e14ae3bff 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -53,9 +53,6 @@
 #define AMP_VAL_IDX_SHIFT       19
 #define AMP_VAL_IDX_MASK        (0x0f<<19)
 
-#define NUM_CONTROL_ALLOC       32
-#define NUM_VERB_ALLOC          32
-
 /* Pin Widget NID */
 #define VT1708_HP_NID           0x13
 #define VT1708_DIGOUT_NID       0x14
@@ -227,8 +224,7 @@ struct via_spec {
 
         /* dynamic controls, init_verbs and input_mux */
         struct auto_pin_cfg autocfg;
-        unsigned int num_kctl_alloc, num_kctl_used;
-        struct snd_kcontrol_new *kctl_alloc;
+        struct snd_array kctls;
         struct hda_input_mux private_imux[2];
         hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];
 
@@ -272,33 +268,31 @@ static int via_add_control(struct via_spec *spec, int type, const char *name,
 {
         struct snd_kcontrol_new *knew;
 
-        if (spec->num_kctl_used >= spec->num_kctl_alloc) {
-                int num = spec->num_kctl_alloc + NUM_CONTROL_ALLOC;
-
-                /* array + terminator */
-                knew = kcalloc(num + 1, sizeof(*knew), GFP_KERNEL);
-                if (!knew)
-                        return -ENOMEM;
-                if (spec->kctl_alloc) {
-                        memcpy(knew, spec->kctl_alloc,
-                               sizeof(*knew) * spec->num_kctl_alloc);
-                        kfree(spec->kctl_alloc);
-                }
-                spec->kctl_alloc = knew;
-                spec->num_kctl_alloc = num;
-        }
-
-        knew = &spec->kctl_alloc[spec->num_kctl_used];
+        snd_array_init(&spec->kctls, sizeof(*knew), 32);
+        knew = snd_array_new(&spec->kctls);
+        if (!knew)
+                return -ENOMEM;
         *knew = vt1708_control_templates[type];
         knew->name = kstrdup(name, GFP_KERNEL);
-
         if (!knew->name)
                 return -ENOMEM;
         knew->private_value = val;
-        spec->num_kctl_used++;
         return 0;
 }
 
+static void via_free_kctls(struct hda_codec *codec)
+{
+        struct via_spec *spec = codec->spec;
+
+        if (spec->kctls.list) {
+                struct snd_kcontrol_new *kctl = spec->kctls.list;
+                int i;
+                for (i = 0; i < spec->kctls.used; i++)
+                        kfree(kctl[i].name);
+        }
+        snd_array_free(&spec->kctls);
+}
+
 /* create input playback/capture controls for the given pin */
 static int via_new_analog_input(struct via_spec *spec, hda_nid_t pin,
                                 const char *ctlname, int idx, int mix_nid)
@@ -896,6 +890,7 @@ static int via_build_controls(struct hda_codec *codec)
                 if (err < 0)
                         return err;
         }
+        via_free_kctls(codec); /* no longer needed */
         return 0;
 }
 
@@ -941,17 +936,11 @@ static int via_build_pcms(struct hda_codec *codec)
 static void via_free(struct hda_codec *codec)
 {
         struct via_spec *spec = codec->spec;
-        unsigned int i;
 
         if (!spec)
                 return;
 
-        if (spec->kctl_alloc) {
-                for (i = 0; i < spec->num_kctl_used; i++)
-                        kfree(spec->kctl_alloc[i].name);
-                kfree(spec->kctl_alloc);
-        }
-
+        via_free_kctls(codec);
         kfree(codec->spec);
 }
 
@@ -1373,8 +1362,8 @@ static int vt1708_parse_auto_config(struct hda_codec *codec)
         if (spec->autocfg.dig_in_pin)
                 spec->dig_in_nid = VT1708_DIGIN_NID;
 
-        if (spec->kctl_alloc)
-                spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
+        if (spec->kctls.list)
+                spec->mixers[spec->num_mixers++] = spec->kctls.list;
 
         spec->init_verbs[spec->num_iverbs++] = vt1708_volume_init_verbs;
 
@@ -1846,8 +1835,8 @@ static int vt1709_parse_auto_config(struct hda_codec *codec)
         if (spec->autocfg.dig_in_pin)
                 spec->dig_in_nid = VT1709_DIGIN_NID;
 
-        if (spec->kctl_alloc)
-                spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
+        if (spec->kctls.list)
+                spec->mixers[spec->num_mixers++] = spec->kctls.list;
 
         spec->input_mux = &spec->private_imux[0];
 
@@ -2390,8 +2379,8 @@ static int vt1708B_parse_auto_config(struct hda_codec *codec)
         if (spec->autocfg.dig_in_pin)
                 spec->dig_in_nid = VT1708B_DIGIN_NID;
 
-        if (spec->kctl_alloc)
-                spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
+        if (spec->kctls.list)
+                spec->mixers[spec->num_mixers++] = spec->kctls.list;
 
         spec->input_mux = &spec->private_imux[0];
 
@@ -2855,8 +2844,8 @@ static int vt1708S_parse_auto_config(struct hda_codec *codec)
 
         spec->extra_dig_out_nid = 0x15;
 
-        if (spec->kctl_alloc)
-                spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
+        if (spec->kctls.list)
+                spec->mixers[spec->num_mixers++] = spec->kctls.list;
 
         spec->input_mux = &spec->private_imux[0];
 
@@ -3174,8 +3163,8 @@ static int vt1702_parse_auto_config(struct hda_codec *codec)
 
         spec->extra_dig_out_nid = 0x1B;
 
-        if (spec->kctl_alloc)
-                spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
+        if (spec->kctls.list)
+                spec->mixers[spec->num_mixers++] = spec->kctls.list;
 
         spec->input_mux = &spec->private_imux[0];