[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240829063118.67453-3-ruanjinjie@huawei.com>
Date: Thu, 29 Aug 2024 14:31:07 +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>, <wens@...e.org>, <jernej.skrabec@...il.com>,
<samuel@...lland.org>, <mcoquelin.stm32@...il.com>, <hkallweit1@...il.com>,
<linux@...linux.org.uk>, <ansuelsmth@...il.com>,
<UNGLinuxDriver@...rochip.com>, <netdev@...r.kernel.org>,
<bcm-kernel-feedback-list@...adcom.com>,
<linux-stm32@...md-mailman.stormreply.com>,
<linux-arm-kernel@...ts.infradead.org>, <linux-sunxi@...ts.linux.dev>,
<krzk@...nel.org>, <jic23@...nel.org>
CC: <ruanjinjie@...wei.com>
Subject: [PATCH net-next v3 02/13] net: stmmac: dwmac-sun8i: Use __free() to simplify code
Avoid need to manually handle of_node_put() by using __free(), which
can simplfy code.
Signed-off-by: Jinjie Ruan <ruanjinjie@...wei.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@...wei.com>
---
v3:
- Add Reviewed-by.
---
.../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
index 4a0ae92b3055..415a0d23b3a5 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
@@ -774,19 +774,17 @@ static int sun8i_dwmac_reset(struct stmmac_priv *priv)
static int get_ephy_nodes(struct stmmac_priv *priv)
{
struct sunxi_priv_data *gmac = priv->plat->bsp_priv;
- struct device_node *mdio_internal;
- struct device_node *mdio_mux;
int ret;
- mdio_mux = of_get_child_by_name(priv->device->of_node, "mdio-mux");
+ struct device_node *mdio_mux __free(device_node) =
+ of_get_child_by_name(priv->device->of_node, "mdio-mux");
if (!mdio_mux) {
dev_err(priv->device, "Cannot get mdio-mux node\n");
return -ENODEV;
}
- mdio_internal = of_get_compatible_child(mdio_mux,
- "allwinner,sun8i-h3-mdio-internal");
- of_node_put(mdio_mux);
+ struct device_node *mdio_internal __free(device_node) =
+ of_get_compatible_child(mdio_mux, "allwinner,sun8i-h3-mdio-internal");
if (!mdio_internal) {
dev_err(priv->device, "Cannot get internal_mdio node\n");
return -ENODEV;
@@ -800,18 +798,14 @@ static int get_ephy_nodes(struct stmmac_priv *priv)
gmac->rst_ephy = of_reset_control_get_exclusive(iphynode, NULL);
if (IS_ERR(gmac->rst_ephy)) {
ret = PTR_ERR(gmac->rst_ephy);
- if (ret == -EPROBE_DEFER) {
- of_node_put(mdio_internal);
+ if (ret == -EPROBE_DEFER)
return ret;
- }
continue;
}
dev_info(priv->device, "Found internal PHY node\n");
- of_node_put(mdio_internal);
return 0;
}
- of_node_put(mdio_internal);
return -ENODEV;
}
--
2.34.1
Powered by blists - more mailing lists