1 files changed, 9 insertions, 39 deletions

diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 5ea21285ee1f..a63c54d9d767 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -61,7 +61,6 @@ struct hda_gspec {
         struct hda_gnode *cap_vol_node; /* Node for capture volume */
         unsigned int cur_cap_src;       /* current capture source */
         struct hda_input_mux input_mux;
-        char cap_labels[HDA_MAX_NUM_INPUTS][16];
 
         unsigned int def_amp_in_caps;
         unsigned int def_amp_out_caps;
@@ -506,11 +505,10 @@ static const char *get_input_type(struct hda_gnode *node, unsigned int *pinctl)
  * returns 0 if not found, 1 if found, or a negative error code.
  */
 static int parse_adc_sub_nodes(struct hda_codec *codec, struct hda_gspec *spec,
-                               struct hda_gnode *node)
+                               struct hda_gnode *node, int idx)
 {
         int i, err;
         unsigned int pinctl;
-        char *label;
         const char *type;
 
         if (node->checked)
@@ -523,7 +521,7 @@ static int parse_adc_sub_nodes(struct hda_codec *codec, struct hda_gspec *spec,
                         child = hda_get_node(spec, node->conn_list[i]);
                         if (! child)
                                 continue;
-                        err = parse_adc_sub_nodes(codec, spec, child);
+                        err = parse_adc_sub_nodes(codec, spec, child, idx);
                         if (err < 0)
                                 return err;
                         if (err > 0) {
@@ -564,9 +562,7 @@ static int parse_adc_sub_nodes(struct hda_codec *codec, struct hda_gspec *spec,
                         return 0;
                 type = "Input";
         }
-        label = spec->cap_labels[spec->input_mux.num_items];
-        strcpy(label, type);
-        spec->input_mux.items[spec->input_mux.num_items].label = label;
+        snd_hda_add_imux_item(&spec->input_mux, type, idx, NULL);
 
         /* unmute the PIN external input */
         unmute_input(codec, node, 0); /* index = 0? */
@@ -577,29 +573,6 @@ static int parse_adc_sub_nodes(struct hda_codec *codec, struct hda_gspec *spec,
         return 1; /* found */
 }
 
-/* add a capture source element */
-static void add_cap_src(struct hda_gspec *spec, int idx)
-{
-        struct hda_input_mux_item *csrc;
-        char *buf;
-        int num, ocap;
-
-        num = spec->input_mux.num_items;
-        csrc = &spec->input_mux.items[num];
-        buf = spec->cap_labels[num];
-        for (ocap = 0; ocap < num; ocap++) {
-                if (! strcmp(buf, spec->cap_labels[ocap])) {
-                        /* same label already exists,
-                         * put the index number to be unique
-                         */
-                        sprintf(buf, "%s %d", spec->cap_labels[ocap], num);
-                        break;
-                }
-        }
-        csrc->index = idx;
-        spec->input_mux.num_items++;
-}
-
 /*
  * parse input
  */
@@ -624,22 +597,18 @@ static int parse_input_path(struct hda_codec *codec, struct hda_gnode *adc_node)
         for (i = 0; i < adc_node->nconns; i++) {
                 node = hda_get_node(spec, adc_node->conn_list[i]);
                 if (node && node->type == AC_WID_PIN) {
-                        err = parse_adc_sub_nodes(codec, spec, node);
+                        err = parse_adc_sub_nodes(codec, spec, node, i);
                         if (err < 0)
                                 return err;
-                        else if (err > 0)
-                                add_cap_src(spec, i);
                 }
         }
         /* ... then check the rests, more complicated connections */
         for (i = 0; i < adc_node->nconns; i++) {
                 node = hda_get_node(spec, adc_node->conn_list[i]);
                 if (node && node->type != AC_WID_PIN) {
-                        err = parse_adc_sub_nodes(codec, spec, node);
+                        err = parse_adc_sub_nodes(codec, spec, node, i);
                         if (err < 0)
                                 return err;
-                        else if (err > 0)
-                                add_cap_src(spec, i);
                 }
         }
 
@@ -793,7 +762,8 @@ static int check_existing_control(struct hda_codec *codec, const char *type, con
 /*
  * build output mixer controls
  */
-static int create_output_mixers(struct hda_codec *codec, const char **names)
+static int create_output_mixers(struct hda_codec *codec,
+                                const char * const *names)
 {
         struct hda_gspec *spec = codec->spec;
         int i, err;
@@ -811,8 +781,8 @@ static int create_output_mixers(struct hda_codec *codec, const char **names)
 static int build_output_controls(struct hda_codec *codec)
 {
         struct hda_gspec *spec = codec->spec;
-        static const char *types_speaker[] = { "Speaker", "Headphone" };
-        static const char *types_line[] = { "Front", "Headphone" };
+        static const char * const types_speaker[] = { "Speaker", "Headphone" };
+        static const char * const types_line[] = { "Front", "Headphone" };
 
         switch (spec->pcm_vol_nodes) {
         case 1: