ASoC: audio-graph: cleanup graph_for_each_link()

audio-graph checks DT links 2 times. 1st is for counting DAIs / links
to allocating memory, 2nd is for detecting DAIs.
To detecting DAIs as CPU-dummy -> dummy-Codec order when DPCM case,
it uses  loops 2 times.
Because of this kind of complex background, it needs to use local
varuable for it, and each call-back functions need to care about it.

Now, 1st and 2nd DT link check are using same order,
thus we can share same code. This patch do it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/878s6a1tpf.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 3a967c520b01fa30ecccc17162a39943825d9ef0..ee1d924d68e55303b2a63f880ff4cddcf324d064 100644 (file)
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -212,8 +212,7 @@ static void graph_parse_mclk_fs(struct device_node *top,
 static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
                                  struct device_node *cpu_ep,
                                  struct device_node *codec_ep,
-                                 struct link_info *li,
-                                 int dup_codec)
+                                 struct link_info *li)
 {
        struct device *dev = simple_priv_to_dev(priv);
        struct snd_soc_card *card = simple_priv_to_card(priv);
@@ -229,18 +228,6 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
        struct snd_soc_dai_link_component *codecs = dai_link->codecs;
        int ret;
 
-       /*
-        * Codec endpoint can be NULL for pluggable audio HW.
-        * Platform DT can populate the Codec endpoint depending on the
-        * plugged HW.
-        */
-       if (!li->cpu && !codec_ep)
-               return 0;
-
-       /* Do it all CPU endpoint, and 1st Codec endpoint */
-       if (!li->cpu && dup_codec)
-               return 0;
-
        port    = of_get_parent(ep);
        ports   = of_get_parent(port);
        node    = of_graph_get_port_parent(ep);
@@ -382,10 +369,6 @@ static int graph_dai_link_of(struct asoc_simple_priv *priv,
        struct asoc_simple_dai *codec_dai;
        int ret, single_cpu;
 
-       /* Do it only CPU turn */
-       if (!li->cpu)
-               return 0;
-
        dev_dbg(dev, "link_of (%pOF)\n", cpu_ep);
 
        li->link++;
@@ -466,7 +449,7 @@ static inline bool parse_as_dpcm_link(struct asoc_simple_priv *priv,
        return false;
 }
 
-static int graph_for_each_link(struct asoc_simple_priv *priv,
+static int __graph_for_each_link(struct asoc_simple_priv *priv,
                        struct link_info *li,
                        int (*func_noml)(struct asoc_simple_priv *priv,
                                         struct device_node *cpu_ep,
@@ -475,7 +458,7 @@ static int graph_for_each_link(struct asoc_simple_priv *priv,
                        int (*func_dpcm)(struct asoc_simple_priv *priv,
                                         struct device_node *cpu_ep,
                                         struct device_node *codec_ep,
-                                        struct link_info *li, int dup_codec))
+                                        struct link_info *li))
 {
        struct of_phandle_iterator it;
        struct device *dev = simple_priv_to_dev(priv);
@@ -486,7 +469,7 @@ static int graph_for_each_link(struct asoc_simple_priv *priv,
        struct device_node *codec_port;
        struct device_node *codec_port_old = NULL;
        struct asoc_simple_data adata;
-       int rc, ret;
+       int rc, ret = 0;
 
        /* loop for all listed CPU port */
        of_for_each_phandle(&it, rc, node, "dais", NULL, 0) {
@@ -509,12 +492,21 @@ static int graph_for_each_link(struct asoc_simple_priv *priv,
                        graph_parse_convert(dev, cpu_ep,   &adata);
 
                        /* check if link requires DPCM parsing */
-                       if (parse_as_dpcm_link(priv, codec_port, &adata))
-                               ret = func_dpcm(priv, cpu_ep, codec_ep, li,
-                                               (codec_port_old == codec_port));
+                       if (parse_as_dpcm_link(priv, codec_port, &adata)) {
+                               /*
+                                * Codec endpoint can be NULL for pluggable audio HW.
+                                * Platform DT can populate the Codec endpoint depending on the
+                                * plugged HW.
+                                */
+                               /* Do it all CPU endpoint, and 1st Codec endpoint */
+                               if (li->cpu ||
+                                   ((codec_port_old != codec_port) && codec_ep))
+                                       ret = func_dpcm(priv, cpu_ep, codec_ep, li);
                        /* else normal sound */
-                       else
-                               ret = func_noml(priv, cpu_ep, codec_ep, li);
+                       } else {
+                               if (li->cpu)
+                                       ret = func_noml(priv, cpu_ep, codec_ep, li);
+                       }
 
                        of_node_put(codec_ep);
                        of_node_put(codec_port);
@@ -529,6 +521,39 @@ static int graph_for_each_link(struct asoc_simple_priv *priv,
        return 0;
 }
 
+static int graph_for_each_link(struct asoc_simple_priv *priv,
+                              struct link_info *li,
+                              int (*func_noml)(struct asoc_simple_priv *priv,
+                                               struct device_node *cpu_ep,
+                                               struct device_node *codec_ep,
+                                               struct link_info *li),
+                              int (*func_dpcm)(struct asoc_simple_priv *priv,
+                                               struct device_node *cpu_ep,
+                                               struct device_node *codec_ep,
+                                               struct link_info *li))
+{
+       int ret;
+       /*
+        * Detect all CPU first, and Detect all Codec 2nd.
+        *
+        * In Normal sound case, all DAIs are detected
+        * as "CPU-Codec".
+        *
+        * In DPCM sound case,
+        * all CPUs   are detected as "CPU-dummy", and
+        * all Codecs are detected as "dummy-Codec".
+        * To avoid random sub-device numbering,
+        * detect "dummy-Codec" in last;
+        */
+       for (li->cpu = 1; li->cpu >= 0; li->cpu--) {
+               ret = __graph_for_each_link(priv, li, func_noml, func_dpcm);
+               if (ret < 0)
+                       break;
+       }
+
+       return ret;
+}
+
 static void graph_get_dais_count(struct asoc_simple_priv *priv,
                                 struct link_info *li);
 
@@ -566,25 +591,11 @@ int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev)
                return ret;
 
        memset(&li, 0, sizeof(li));
-       for (li.cpu = 1; li.cpu >= 0; li.cpu--) {
-               /*
-                * Detect all CPU first, and Detect all Codec 2nd.
-                *
-                * In Normal sound case, all DAIs are detected
-                * as "CPU-Codec".
-                *
-                * In DPCM sound case,
-                * all CPUs   are detected as "CPU-dummy", and
-                * all Codecs are detected as "dummy-Codec".
-                * To avoid random sub-device numbering,
-                * detect "dummy-Codec" in last;
-                */
-               ret = graph_for_each_link(priv, &li,
-                                         graph_dai_link_of,
-                                         graph_dai_link_of_dpcm);
-               if (ret < 0)
-                       goto err;
-       }
+       ret = graph_for_each_link(priv, &li,
+                                 graph_dai_link_of,
+                                 graph_dai_link_of_dpcm);
+       if (ret < 0)
+               goto err;
 
        ret = asoc_simple_parse_card_name(card, NULL);
        if (ret < 0)
@@ -617,10 +628,6 @@ static int graph_count_noml(struct asoc_simple_priv *priv,
 {
        struct device *dev = simple_priv_to_dev(priv);
 
-       /* Do it only CPU turn */
-       if (!li->cpu)
-               return 0;
-
        li->link += 1; /* 1xCPU-Codec */
        li->dais += 2; /* 1xCPU + 1xCodec */
 
@@ -632,27 +639,14 @@ static int graph_count_noml(struct asoc_simple_priv *priv,
 static int graph_count_dpcm(struct asoc_simple_priv *priv,
                            struct device_node *cpu_ep,
                            struct device_node *codec_ep,
-                           struct link_info *li,
-                           int dup_codec)
+                           struct link_info *li)
 {
        struct device *dev = simple_priv_to_dev(priv);
 
-       /*
-        * Codec endpoint can be NULL for pluggable audio HW.
-        * Platform DT can populate the Codec endpoint depending on the
-        * plugged HW.
-        */
-       if (!li->cpu && !codec_ep)
-               return 0;
-
-       /* Do it all CPU endpoint, and 1st Codec endpoint */
-       if (!li->cpu && dup_codec)
-               return 0;
-
        if (li->cpu) {
                li->link++; /* 1xCPU-dummy */
                li->dais++; /* 1xCPU */
-       } else if (!dup_codec && codec_ep) {
+       } else {
                li->link++; /* 1xdummy-Codec */
                li->conf++; /* 1xdummy-Codec */
                li->dais++; /* 1xCodec */
@@ -714,10 +708,9 @@ static void graph_get_dais_count(struct asoc_simple_priv *priv,
         *      => 4 DAIs  = 2xCPU + 2xCodec
         *      => 1 ccnf  = 1xdummy-Codec
         */
-       for (li->cpu = 1; li->cpu >= 0; li->cpu--)
-               graph_for_each_link(priv, li,
-                                   graph_count_noml,
-                                   graph_count_dpcm);
+       graph_for_each_link(priv, li,
+                           graph_count_noml,
+                           graph_count_dpcm);
        dev_dbg(dev, "link %d, dais %d, ccnf %d\n",
                li->link, li->dais, li->conf);
 }