]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: ftgmac100: Simplify error handling for ftgmac100_initial_mac
authorAndrew Lunn <andrew@lunn.ch>
Fri, 6 Feb 2026 03:17:47 +0000 (11:17 +0800)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 10 Feb 2026 12:40:50 +0000 (13:40 +0100)
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>
Link: https://patch.msgid.link/20260206-ftgmac-cleanup-v5-7-ad28a9067ea7@aspeedtech.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/ethernet/faraday/ftgmac100.c

index 1fb03dd55c8f12f680fb2e8424d6d0f2215d88ca..e511d6d5f7c2e6cd3ab895e097581469753b65ee 100644 (file)
@@ -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 ||