[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240827075219.3793198-7-ruanjinjie@huawei.com>
Date: Tue, 27 Aug 2024 15:52:18 +0800
From: Jinjie Ruan <ruanjinjie@...wei.com>
To: <woojung.huh@...rochip.com>, <andrew@...n.ch>, <f.fainelli@...il.com>,
<olteanv@...il.com>, <davem@...emloft.net>, <edumazet@...gle.com>,
<kuba@...nel.org>, <pabeni@...hat.com>, <linus.walleij@...aro.org>,
<alsi@...g-olufsen.dk>, <justin.chen@...adcom.com>,
<sebastian.hesselbarth@...il.com>, <alexandre.torgue@...s.st.com>,
<joabreu@...opsys.com>, <mcoquelin.stm32@...il.com>, <wens@...e.org>,
<jernej.skrabec@...il.com>, <samuel@...lland.org>, <hkallweit1@...il.com>,
<linux@...linux.org.uk>, <ansuelsmth@...il.com>,
<UNGLinuxDriver@...rochip.com>, <netdev@...r.kernel.org>,
<linux-kernel@...r.kernel.org>, <bcm-kernel-feedback-list@...adcom.com>,
<linux-arm-kernel@...ts.infradead.org>, <linux-sunxi@...ts.linux.dev>,
<linux-stm32@...md-mailman.stormreply.com>, <krzk@...nel.org>,
<jic23@...nel.org>
CC: <ruanjinjie@...wei.com>
Subject: [PATCH -next 6/7] net: dsa: microchip: Use scoped function and __free() to simplfy code
Avoids the need for manual cleanup of_node_put() in early exits
from the loop by using for_each_available_child_of_node_scoped()
and __free().
Signed-off-by: Jinjie Ruan <ruanjinjie@...wei.com>
---
drivers/net/dsa/microchip/ksz_common.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index cd3991792b69..8058a0b7c161 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -4595,7 +4595,6 @@ static int ksz_parse_drive_strength(struct ksz_device *dev)
int ksz_switch_register(struct ksz_device *dev)
{
const struct ksz_chip_data *info;
- struct device_node *port, *ports;
phy_interface_t interface;
unsigned int port_num;
int ret;
@@ -4677,25 +4676,22 @@ int ksz_switch_register(struct ksz_device *dev)
ret = of_get_phy_mode(dev->dev->of_node, &interface);
if (ret == 0)
dev->compat_interface = interface;
- ports = of_get_child_by_name(dev->dev->of_node, "ethernet-ports");
+ struct device_node *ports __free(device_node) =
+ of_get_child_by_name(dev->dev->of_node, "ethernet-ports");
if (!ports)
ports = of_get_child_by_name(dev->dev->of_node, "ports");
if (ports) {
- for_each_available_child_of_node(ports, port) {
+ for_each_available_child_of_node_scoped(ports, port) {
if (of_property_read_u32(port, "reg",
&port_num))
continue;
- if (!(dev->port_mask & BIT(port_num))) {
- of_node_put(port);
- of_node_put(ports);
+ if (!(dev->port_mask & BIT(port_num)))
return -EINVAL;
- }
of_get_phy_mode(port,
&dev->ports[port_num].interface);
ksz_parse_rgmii_delay(dev, port_num, port);
}
- of_node_put(ports);
}
dev->synclko_125 = of_property_read_bool(dev->dev->of_node,
"microchip,synclko-125");
--
2.34.1
Powered by blists - more mailing lists