topology: Remove code parsing index value in paring each object

We insert a new element into the object list based on its index value, so we parse
index value in "tplg_elem_new_common" before insert it, and then remove code
parsing index value in parsing each object.

Signed-off-by: Fuwei Tang <fuweix.tang@intel.com>
Reviewed-by: Mengdong Lin <mengdong.lin@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/src/topology/ctl.c b/src/topology/ctl.c
index c026c2a..cba98f1 100644 (file)
--- a/src/topology/ctl.c
+++ b/src/topology/ctl.c
@@ -396,15 +396,6 @@ int tplg_parse_control_bytes(snd_tplg_t *tplg,
                if (id[0] == '#')
                        continue;
 
-               if (strcmp(id, "index") == 0) {
-                       if (snd_config_get_string(n, &val) < 0)
-                               return -EINVAL;
-
-                       elem->index = atoi(val);
-                       tplg_dbg("\t%s: %d\n", id, elem->index);
-                       continue;
-               }
-
                if (strcmp(id, "base") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;
@@ -537,15 +528,6 @@ int tplg_parse_control_enum(snd_tplg_t *tplg, snd_config_t *cfg,
                if (id[0] == '#')
                        continue;
 
-               if (strcmp(id, "index") == 0) {
-                       if (snd_config_get_string(n, &val) < 0)
-                               return -EINVAL;
-
-                       elem->index = atoi(val);
-                       tplg_dbg("\t%s: %d\n", id, elem->index);
-                       continue;
-               }
-
                if (strcmp(id, "texts") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;
@@ -647,15 +629,6 @@ int tplg_parse_control_mixer(snd_tplg_t *tplg,
                if (id[0] == '#')
                        continue;
 
-               if (strcmp(id, "index") == 0) {
-                       if (snd_config_get_string(n, &val) < 0)
-                               return -EINVAL;
-
-                       elem->index = atoi(val);
-                       tplg_dbg("\t%s: %d\n", id, elem->index);
-                       continue;
-               }
-
                if (strcmp(id, "channel") == 0) {
                        if (mc->num_channels >= SND_SOC_TPLG_MAX_CHAN) {
                                SNDERR("error: too many channels %s\n",

diff --git a/src/topology/dapm.c b/src/topology/dapm.c
index eef72bb..ba5d9fe 100644 (file)
--- a/src/topology/dapm.c
+++ b/src/topology/dapm.c
@@ -483,15 +483,6 @@ int tplg_parse_dapm_widget(snd_tplg_t *tplg,
                if (id[0] == '#')
                        continue;
 
-               if (strcmp(id, "index") == 0) {
-                       if (snd_config_get_string(n, &val) < 0)
-                               return -EINVAL;
-
-                       elem->index = atoi(val);
-                       tplg_dbg("\t%s: %d\n", id, elem->index);
-                       continue;
-               }
-
                if (strcmp(id, "type") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;

diff --git a/src/topology/data.c b/src/topology/data.c
index 31e4ee1..01e2bd1 100644 (file)
--- a/src/topology/data.c
+++ b/src/topology/data.c
@@ -1009,15 +1009,6 @@ int tplg_parse_data(snd_tplg_t *tplg, snd_config_t *cfg,
                        continue;
                }
 
-               if (strcmp(id, "index") == 0) {
-                       if (snd_config_get_string(n, &val) < 0)
-                               return -EINVAL;
-
-                       elem->index = atoi(val);
-                       tplg_dbg("\t%s: %d\n", id, elem->index);
-                       continue;
-               }
-
                if (strcmp(id, "type") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;

diff --git a/src/topology/pcm.c b/src/topology/pcm.c
index 50a373a..b5e6378 100644 (file)
--- a/src/topology/pcm.c
+++ b/src/topology/pcm.c
@@ -553,15 +553,6 @@ int tplg_parse_pcm(snd_tplg_t *tplg,
                if (id[0] == '#')
                        continue;
 
-               if (strcmp(id, "index") == 0) {
-                       if (snd_config_get_string(n, &val) < 0)
-                               return -EINVAL;
-
-                       elem->index = atoi(val);
-                       tplg_dbg("\t%s: %d\n", id, elem->index);
-                       continue;
-               }
-
                if (strcmp(id, "id") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;
@@ -653,15 +644,6 @@ int tplg_parse_dai(snd_tplg_t *tplg,
                if (id[0] == '#')
                        continue;
 
-               if (strcmp(id, "index") == 0) {
-                       if (snd_config_get_string(n, &val) < 0)
-                               return -EINVAL;
-
-                       elem->index = atoi(val);
-                       tplg_dbg("\t%s: %d\n", id, elem->index);
-                       continue;
-               }
-
                if (strcmp(id, "id") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;
@@ -803,15 +785,6 @@ int tplg_parse_link(snd_tplg_t *tplg,
                if (id[0] == '#')
                        continue;
 
-               if (strcmp(id, "index") == 0) {
-                       if (snd_config_get_string(n, &val) < 0)
-                               return -EINVAL;
-
-                       elem->index = atoi(val);
-                       tplg_dbg("\t%s: %d\n", id, elem->index);
-                       continue;
-               }
-
                if (strcmp(id, "id") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;
@@ -917,15 +890,6 @@ int tplg_parse_cc(snd_tplg_t *tplg,
                if (id[0] == '#')
                        continue;
 
-               if (strcmp(id, "index") == 0) {
-                       if (snd_config_get_string(n, &val) < 0)
-                               return -EINVAL;
-
-                       elem->index = atoi(val);
-                       tplg_dbg("\t%s: %d\n", id, elem->index);
-                       continue;
-               }
-
                if (strcmp(id, "id") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;