Commit 2d86ecb6 authored by Jinjie Ruan's avatar Jinjie Ruan Committed by Jakub Kicinski

net: dsa: sja1105: Simplify with scoped for each OF child loop

Use scoped for_each_available_child_of_node_scoped() when iterating over
device nodes to make code a bit simpler.
Signed-off-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
Link: https://patch.msgid.link/20240820075047.681223-1-ruanjinjie@huawei.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e58c3f3d
...@@ -1188,9 +1188,8 @@ static int sja1105_parse_ports_node(struct sja1105_private *priv, ...@@ -1188,9 +1188,8 @@ static int sja1105_parse_ports_node(struct sja1105_private *priv,
struct device_node *ports_node) struct device_node *ports_node)
{ {
struct device *dev = &priv->spidev->dev; struct device *dev = &priv->spidev->dev;
struct device_node *child;
for_each_available_child_of_node(ports_node, child) { for_each_available_child_of_node_scoped(ports_node, child) {
struct device_node *phy_node; struct device_node *phy_node;
phy_interface_t phy_mode; phy_interface_t phy_mode;
u32 index; u32 index;
...@@ -1200,7 +1199,6 @@ static int sja1105_parse_ports_node(struct sja1105_private *priv, ...@@ -1200,7 +1199,6 @@ static int sja1105_parse_ports_node(struct sja1105_private *priv,
if (of_property_read_u32(child, "reg", &index) < 0) { if (of_property_read_u32(child, "reg", &index) < 0) {
dev_err(dev, "Port number not defined in device tree " dev_err(dev, "Port number not defined in device tree "
"(property \"reg\")\n"); "(property \"reg\")\n");
of_node_put(child);
return -ENODEV; return -ENODEV;
} }
...@@ -1210,7 +1208,6 @@ static int sja1105_parse_ports_node(struct sja1105_private *priv, ...@@ -1210,7 +1208,6 @@ static int sja1105_parse_ports_node(struct sja1105_private *priv,
dev_err(dev, "Failed to read phy-mode or " dev_err(dev, "Failed to read phy-mode or "
"phy-interface-type property for port %d\n", "phy-interface-type property for port %d\n",
index); index);
of_node_put(child);
return -ENODEV; return -ENODEV;
} }
...@@ -1219,7 +1216,6 @@ static int sja1105_parse_ports_node(struct sja1105_private *priv, ...@@ -1219,7 +1216,6 @@ static int sja1105_parse_ports_node(struct sja1105_private *priv,
if (!of_phy_is_fixed_link(child)) { if (!of_phy_is_fixed_link(child)) {
dev_err(dev, "phy-handle or fixed-link " dev_err(dev, "phy-handle or fixed-link "
"properties missing!\n"); "properties missing!\n");
of_node_put(child);
return -ENODEV; return -ENODEV;
} }
/* phy-handle is missing, but fixed-link isn't. /* phy-handle is missing, but fixed-link isn't.
...@@ -1233,10 +1229,8 @@ static int sja1105_parse_ports_node(struct sja1105_private *priv, ...@@ -1233,10 +1229,8 @@ static int sja1105_parse_ports_node(struct sja1105_private *priv,
priv->phy_mode[index] = phy_mode; priv->phy_mode[index] = phy_mode;
err = sja1105_parse_rgmii_delays(priv, index, child); err = sja1105_parse_rgmii_delays(priv, index, child);
if (err) { if (err)
of_node_put(child);
return err; return err;
}
} }
return 0; return 0;
......
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