From: Jacky Chou <jacky_chou@aspeedtech.com>
To: Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Andrew Lunn <andrew@lunn.ch>,
Jacky Chou <jacky_chou@aspeedtech.com>,
Simon Horman <horms@kernel.org>
Subject: [PATCH net-next v4 07/15] net: ftgmac100: Simplify error handling for ftgmac100_initial_mac
Date: Wed, 4 Feb 2026 13:26:33 +0800 [thread overview]
Message-ID: <20260204-ftgmac-cleanup-v4-7-b7f379939b76@aspeedtech.com> (raw)
In-Reply-To: <20260204-ftgmac-cleanup-v4-0-b7f379939b76@aspeedtech.com>
From: Andrew Lunn <andrew@lunn.ch>
ftgmac100_initial_mac() does not allocate any resources. All resources
by the probe function up until this call point use devm_ methods. So
just return the error code rather than use a goto.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Jacky Chou <jacky_chou@aspeedtech.com>
---
drivers/net/ethernet/faraday/ftgmac100.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 1fb03dd55c8f..e511d6d5f7c2 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -1914,7 +1914,7 @@ static int ftgmac100_probe(struct platform_device *pdev)
/* MAC address from chip or random one */
err = ftgmac100_initial_mac(priv);
if (err)
- goto err_phy_connect;
+ return err;
if (priv->mac_id == FTGMAC100_AST2400 ||
priv->mac_id == FTGMAC100_AST2500 ||
--
2.34.1
next prev parent reply other threads:[~2026-02-04 5:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-04 5:26 [PATCH net-next v4 00/15] net: ftgmac100: Various probe cleanups Jacky Chou
2026-02-04 5:26 ` [PATCH net-next v4 01/15] net: ftgmac100: List all compatibles Jacky Chou
2026-02-04 5:26 ` [PATCH net-next v4 02/15] net: ftgmac100: Add match data containing MAC ID Jacky Chou
2026-02-04 5:26 ` [PATCH net-next v4 03/15] net: ftgmac100: Replace all of_device_is_compatible() Jacky Chou
2026-02-04 5:26 ` [PATCH net-next v4 04/15] net: ftgmac100: Use devm_alloc_etherdev() Jacky Chou
2026-02-04 5:26 ` [PATCH net-next v4 05/15] net: ftgmac100: Use devm_request_memory_region/devm_ioremap Jacky Chou
2026-02-04 5:26 ` [PATCH net-next v4 06/15] net: ftgmac100: Use devm_clk_get_enabled Jacky Chou
2026-02-04 5:26 ` Jacky Chou [this message]
2026-02-04 5:26 ` [PATCH net-next v4 08/15] net: ftgmac100: Move NCSI probe code into a helper Jacky Chou
2026-02-04 5:26 ` [PATCH net-next v4 09/15] net: ftgmac100: Always register the MDIO bus when it exists Jacky Chou
2026-02-04 5:26 ` [PATCH net-next v4 10/15] net: ftgmac100: Simplify legacy MDIO setup Jacky Chou
2026-02-04 5:26 ` [PATCH net-next v4 11/15] net: ftgmac100: Move DT probe into a helper Jacky Chou
2026-02-04 5:26 ` [PATCH net-next v4 12/15] net: ftgmac100: Remove redundant PHY_POLL Jacky Chou
2026-02-04 5:26 ` [PATCH net-next v4 13/15] net: ftgmac100: Simplify condition on HW arbitration Jacky Chou
2026-02-04 5:26 ` [PATCH net-next v4 14/15] net: ftgmac100: Fix wrong netif_napi_del in release Jacky Chou
2026-02-04 5:26 ` [PATCH net-next v4 15/15] net: ftgmac100: Use devm_mdiobus_alloc/devm_of_mdiobus_register Jacky Chou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260204-ftgmac-cleanup-v4-7-b7f379939b76@aspeedtech.com \
--to=jacky_chou@aspeedtech.com \
--cc=andrew+netdev@lunn.ch \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox