From: Russell King (Oracle) Date: Wed, 15 Oct 2025 16:11:01 +0000 (+0100) Subject: net: stmmac: rename stmmac_phy_setup() to include phylink X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a4094ba7ad2563a96f0482db53d042b695892b0;p=thirdparty%2Fkernel%2Flinux.git net: stmmac: rename stmmac_phy_setup() to include phylink stmmac_phy_setup() does not set up any PHY, but does setup phylink. Rename this function to stmmac_phylink_setup() to reflect more what it is doing. Signed-off-by: Russell King (Oracle) Reviewed-by: Maxime Chevallier Reviewed-by: Gatien Chevallier Reviewed-by: Andrew Lunn Link: https://patch.msgid.link/E1v945d-0000000Ameh-3Bs7@rmk-PC.armlinux.org.uk Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 500cfd19e6b5..c9fa965c8566 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1185,7 +1185,7 @@ static int stmmac_init_phy(struct net_device *dev) return 0; } -static int stmmac_phy_setup(struct stmmac_priv *priv) +static int stmmac_phylink_setup(struct stmmac_priv *priv) { struct stmmac_mdio_bus_data *mdio_bus_data; struct phylink_config *config; @@ -7642,7 +7642,7 @@ int stmmac_dvr_probe(struct device *device, if (ret) goto error_pcs_setup; - ret = stmmac_phy_setup(priv); + ret = stmmac_phylink_setup(priv); if (ret) { netdev_err(ndev, "failed to setup phy (%d)\n", ret); goto error_phy_setup;