Commit de849243 authored by Zhang Zekun's avatar Zhang Zekun Committed by Mark Brown

ASoC: audio-graph-card: Use for_each_child_of_node_scoped() to simplify code

for_each_child_of_node_scoped() can put the device_node automatically.
So, using it to make the code logic more simple and remove the device_node
clean up code.
Signed-off-by: default avatarZhang Zekun <zhangzekun11@huawei.com>
Reviewed-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/20240827070650.11424-2-zhangzekun11@huawei.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7c626ce4
...@@ -363,7 +363,6 @@ static int __graph_for_each_link(struct simple_util_priv *priv, ...@@ -363,7 +363,6 @@ static int __graph_for_each_link(struct simple_util_priv *priv,
struct device *dev = simple_priv_to_dev(priv); struct device *dev = simple_priv_to_dev(priv);
struct device_node *node = dev->of_node; struct device_node *node = dev->of_node;
struct device_node *cpu_port; struct device_node *cpu_port;
struct device_node *cpu_ep;
struct device_node *codec_ep; struct device_node *codec_ep;
struct device_node *codec_port; struct device_node *codec_port;
struct device_node *codec_port_old = NULL; struct device_node *codec_port_old = NULL;
...@@ -373,14 +372,9 @@ static int __graph_for_each_link(struct simple_util_priv *priv, ...@@ -373,14 +372,9 @@ static int __graph_for_each_link(struct simple_util_priv *priv,
/* loop for all listed CPU port */ /* loop for all listed CPU port */
of_for_each_phandle(&it, rc, node, "dais", NULL, 0) { of_for_each_phandle(&it, rc, node, "dais", NULL, 0) {
cpu_port = it.node; cpu_port = it.node;
cpu_ep = NULL;
/* loop for all CPU endpoint */ /* loop for all CPU endpoint */
while (1) { for_each_child_of_node_scoped(cpu_port, cpu_ep) {
cpu_ep = of_get_next_child(cpu_port, cpu_ep);
if (!cpu_ep)
break;
/* get codec */ /* get codec */
codec_ep = of_graph_get_remote_endpoint(cpu_ep); codec_ep = of_graph_get_remote_endpoint(cpu_ep);
codec_port = ep_to_port(codec_ep); codec_port = ep_to_port(codec_ep);
...@@ -410,10 +404,8 @@ static int __graph_for_each_link(struct simple_util_priv *priv, ...@@ -410,10 +404,8 @@ static int __graph_for_each_link(struct simple_util_priv *priv,
of_node_put(codec_ep); of_node_put(codec_ep);
of_node_put(codec_port); of_node_put(codec_port);
if (ret < 0) { if (ret < 0)
of_node_put(cpu_ep);
return ret; return ret;
}
codec_port_old = codec_port; codec_port_old = codec_port;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment