ASoC: SOF: topology: Skip parsing DAI link tokens if not needed

Do not parse these tokens if they are not defined in the IPC version
specific token list. In the case of IPC4 with HDA topologies for
example, no DAI link specific tokens need to be added in topology.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20220426171743.171061-10-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index 739f343010fc3f717b9dd7325f59bf76c6b9f3b0..b1fcab7ce48e8476a9c4f09578f1aa72488f7e1f 100644 (file)
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -1721,14 +1721,16 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, struct snd_
                return -ENOMEM;
        }
 
-       /* parse one set of DAI link tokens */
-       ret = sof_copy_tuples(sdev, private->array, le32_to_cpu(private->size),
-                             SOF_DAI_LINK_TOKENS, 1, slink->tuples,
-                             num_tuples, &slink->num_tuples);
-       if (ret < 0) {
-               dev_err(scomp->dev, "failed to parse %s for dai link %s\n",
-                       token_list[SOF_DAI_LINK_TOKENS].name, link->name);
-               goto err;
+       if (token_list[SOF_DAI_LINK_TOKENS].tokens) {
+               /* parse one set of DAI link tokens */
+               ret = sof_copy_tuples(sdev, private->array, le32_to_cpu(private->size),
+                                     SOF_DAI_LINK_TOKENS, 1, slink->tuples,
+                                     num_tuples, &slink->num_tuples);
+               if (ret < 0) {
+                       dev_err(scomp->dev, "failed to parse %s for dai link %s\n",
+                               token_list[SOF_DAI_LINK_TOKENS].name, link->name);
+                       goto err;
+               }
        }
 
        /* nothing more to do if there are no DAI type-specific tokens defined */