[PATCH v3 18/24] ASoC: audio-graph-card2: use of_graph_get_next_port()

[Kuninori Morimoto]

Now we can use of_graph_get_next_port() for port parsing.
Use it on audio-graph-card2 driver.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto...@renesas.com>
---
 sound/soc/generic/audio-graph-card2.c | 29 ++++++++-------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/sound/soc/generic/audio-graph-card2.c 
b/sound/soc/generic/audio-graph-card2.c
index c3763719a69f..b2bd5b70a712 100644
--- a/sound/soc/generic/audio-graph-card2.c
+++ b/sound/soc/generic/audio-graph-card2.c
@@ -339,12 +339,7 @@ static struct device_node *graph_get_next_multi_ep(struct 
device_node **port)
         *      port@1 { rep1 };
         * };
         */
-       do {
-               *port = of_get_next_child(ports, *port);
-               if (!*port)
-                       break;
-       } while (!of_node_name_eq(*port, "port"));
-
+       *port = of_graph_get_next_port(ports, *port);
        if (*port) {
                ep  = port_to_endpoint(*port);
                rep = of_graph_get_remote_endpoint(ep);
@@ -539,7 +534,8 @@ static int graph_parse_node_multi_nm(struct 
snd_soc_dai_link *dai_link,
         */
        struct device_node *mcpu_ep             = port_to_endpoint(mcpu_port);
        struct device_node *mcpu_ep_n           = mcpu_ep;
-       struct device_node *mcpu_port_top       = 
of_get_next_child(of_get_parent(mcpu_port), NULL);
+       struct device_node *mcpu_ports          = of_get_parent(mcpu_port);
+       struct device_node *mcpu_port_top       = 
of_graph_get_next_port(mcpu_ports, NULL);
        struct device_node *mcpu_ep_top         = 
port_to_endpoint(mcpu_port_top);
        struct device_node *mcodec_ep_top       = 
of_graph_get_remote_endpoint(mcpu_ep_top);
        struct device_node *mcodec_port_top     = of_get_parent(mcodec_ep_top);
@@ -572,12 +568,12 @@ static int graph_parse_node_multi_nm(struct 
snd_soc_dai_link *dai_link,
                        goto mcpu_err;
 
                codec_idx = 0;
-               mcodec_port_i = of_get_next_child(mcodec_ports, NULL);
+               mcodec_port_i = of_graph_get_next_port(mcodec_ports, NULL);
                while (1) {
                        if (codec_idx > dai_link->num_codecs)
                                goto mcodec_err;
 
-                       mcodec_port_i = of_get_next_child(mcodec_ports, 
mcodec_port_i);
+                       mcodec_port_i = of_graph_get_next_port(mcodec_ports, 
mcodec_port_i);
 
                        if (!mcodec_port_i)
                                goto mcodec_err;
@@ -967,7 +963,7 @@ int audio_graph2_link_c2c(struct simple_util_priv *priv,
        of_node_get(lnk);
        port0 = lnk;
        ports = of_get_parent(port0);
-       port1 = of_get_next_child(ports, lnk);
+       port1 = of_graph_get_next_port(ports, port0);
 
        /*
         * Card2 can use original Codec2Codec settings if DT has.
@@ -1099,21 +1095,12 @@ static int graph_counter(struct device_node *lnk)
         */
        if (graph_lnk_is_multi(lnk)) {
                struct device_node *ports = of_get_parent(lnk);
-               struct device_node *port = NULL;
-               int cnt = 0;
 
                /*
                 * CPU/Codec = N:M case has many endpoints.
                 * We can't use of_graph_get_device_endpoint_count() here
                 */
-               while(1) {
-                       port = of_get_next_child(ports, port);
-                       if (!port)
-                               break;
-                       cnt++;
-               }
-
-               return cnt - 1;
+               return of_graph_get_port_count(ports) - 1;
        }
        /*
         * Single CPU / Codec
@@ -1197,7 +1184,7 @@ static int graph_count_c2c(struct simple_util_priv *priv,
 {
        struct device_node *ports = of_get_parent(lnk);
        struct device_node *port0 = lnk;
-       struct device_node *port1 = of_get_next_child(ports, lnk);
+       struct device_node *port1 = of_graph_get_next_port(ports, port0);
        struct device_node *ep0 = port_to_endpoint(port0);
        struct device_node *ep1 = port_to_endpoint(port1);
        struct device_node *codec0 = of_graph_get_remote_port(ep0);
-- 
2.25.1