[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230827134150.2918-2-jszhang@kernel.org>
Date: Sun, 27 Aug 2023 21:41:49 +0800
From: Jisheng Zhang <jszhang@...nel.org>
To: Emil Renner Berthing <kernel@...il.dk>,
Samin Guo <samin.guo@...rfivetech.com>,
Giuseppe Cavallaro <peppe.cavallaro@...com>,
Alexandre Torgue <alexandre.torgue@...s.st.com>,
Jose Abreu <joabreu@...opsys.com>,
"David S . Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Maxime Coquelin <mcoquelin.stm32@...il.com>
Cc: netdev@...r.kernel.org, linux-stm32@...md-mailman.stormreply.com,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: [PATCH net-next 1/2] net: stmmac: dwmac-starfive: improve error handling during probe
After stmmac_probe_config_dt() succeeds, when error happens later,
stmmac_remove_config_dt() needs to be called for proper error handling.
Signed-off-by: Jisheng Zhang <jszhang@...nel.org>
---
.../ethernet/stmicro/stmmac/dwmac-starfive.c | 34 ++++++++++++-------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
index 892612564694..b68f42795eaa 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
@@ -111,18 +111,24 @@ static int starfive_dwmac_probe(struct platform_device *pdev)
"dt configuration failed\n");
dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);
- if (!dwmac)
- return -ENOMEM;
+ if (!dwmac) {
+ err = -ENOMEM;
+ goto err_remove_config_dt;
+ }
dwmac->clk_tx = devm_clk_get_enabled(&pdev->dev, "tx");
- if (IS_ERR(dwmac->clk_tx))
- return dev_err_probe(&pdev->dev, PTR_ERR(dwmac->clk_tx),
- "error getting tx clock\n");
+ if (IS_ERR(dwmac->clk_tx)) {
+ err = dev_err_probe(&pdev->dev, PTR_ERR(dwmac->clk_tx),
+ "error getting tx clock\n");
+ goto err_remove_config_dt;
+ }
clk_gtx = devm_clk_get_enabled(&pdev->dev, "gtx");
- if (IS_ERR(clk_gtx))
- return dev_err_probe(&pdev->dev, PTR_ERR(clk_gtx),
- "error getting gtx clock\n");
+ if (IS_ERR(clk_gtx)) {
+ err = dev_err_probe(&pdev->dev, PTR_ERR(clk_gtx),
+ "error getting gtx clock\n");
+ goto err_remove_config_dt;
+ }
/* Generally, the rgmii_tx clock is provided by the internal clock,
* which needs to match the corresponding clock frequency according
@@ -139,15 +145,17 @@ static int starfive_dwmac_probe(struct platform_device *pdev)
err = starfive_dwmac_set_mode(plat_dat);
if (err)
- return err;
+ goto err_remove_config_dt;
err = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
- if (err) {
- stmmac_remove_config_dt(pdev, plat_dat);
- return err;
- }
+ if (err)
+ goto err_remove_config_dt;
return 0;
+
+err_remove_config_dt:
+ stmmac_remove_config_dt(pdev, plat_dat);
+ return err;
}
static const struct of_device_id starfive_dwmac_match[] = {
--
2.40.1
Powered by blists - more mailing lists