[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240828032343.1218749-14-ruanjinjie@huawei.com>
Date: Wed, 28 Aug 2024 11:23:43 +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 net-next v2 13/13] net: bcmasp: Simplify with __free()
Avoid need to manually handle of_node_put() by using __free(), which
can simplfy code.
Signed-off-by: Jinjie Ruan <ruanjinjie@...wei.com>
---
v2:
- Split into 2 patches.
---
drivers/net/ethernet/broadcom/asp2/bcmasp.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.c b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
index 70219094b7f6..73e767aada2f 100644
--- a/drivers/net/ethernet/broadcom/asp2/bcmasp.c
+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
@@ -1300,7 +1300,6 @@ static void bcmasp_remove_intfs(struct bcmasp_priv *priv)
static int bcmasp_probe(struct platform_device *pdev)
{
- struct device_node *ports_node;
const struct bcmasp_plat_data *pdata;
struct device *dev = &pdev->dev;
struct bcmasp_priv *priv;
@@ -1367,7 +1366,8 @@ static int bcmasp_probe(struct platform_device *pdev)
bcmasp_core_init(priv);
bcmasp_core_init_filters(priv);
- ports_node = of_find_node_by_name(dev->of_node, "ethernet-ports");
+ struct device_node *ports_node __free(device_node) =
+ of_find_node_by_name(dev->of_node, "ethernet-ports");
if (!ports_node) {
dev_warn(dev, "No ports found\n");
return -EINVAL;
@@ -1377,10 +1377,9 @@ static int bcmasp_probe(struct platform_device *pdev)
for_each_available_child_of_node_scoped(ports_node, intf_node) {
intf = bcmasp_interface_create(priv, intf_node, i);
if (!intf) {
- dev_err(dev, "Cannot create eth interface %d\n", i);
bcmasp_remove_intfs(priv);
- ret = -ENOMEM;
- goto of_put_exit;
+ return dev_err_probe(dev, -ENOMEM,
+ "Cannot create eth interface %d\n", i);
}
list_add_tail(&intf->list, &priv->intfs);
i++;
@@ -1406,16 +1405,14 @@ static int bcmasp_probe(struct platform_device *pdev)
"failed to register net_device: %d\n", ret);
priv->destroy_wol(priv);
bcmasp_remove_intfs(priv);
- goto of_put_exit;
+ return ret;
}
count++;
}
dev_info(dev, "Initialized %d port(s)\n", count);
-of_put_exit:
- of_node_put(ports_node);
- return ret;
+ return 0;
}
static void bcmasp_remove(struct platform_device *pdev)
--
2.34.1
Powered by blists - more mailing lists