From: Russell King (Oracle) Date: Thu, 1 May 2025 11:45:06 +0000 (+0100) Subject: net: stmmac: use priv->plat->phy_interface directly X-Git-Tag: v6.16-rc1~132^2~177^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1966be55da5b829fcced4c639a1a9b8729b2c3a0;p=thirdparty%2Flinux.git net: stmmac: use priv->plat->phy_interface directly Avoid using a local variable for priv->plat->phy_interface as this may be modified in the .get_interfaces() method added in a future commit. Signed-off-by: Russell King (Oracle) Reviewed-by: Andrew Lunn Link: https://patch.msgid.link/E1uASLi-0021QX-HG@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 fe7f9e3a92a56..ac6ab121eb330 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1258,7 +1258,6 @@ static int stmmac_init_phy(struct net_device *dev) static int stmmac_phy_setup(struct stmmac_priv *priv) { struct stmmac_mdio_bus_data *mdio_bus_data; - int mode = priv->plat->phy_interface; struct phylink_config *config; struct fwnode_handle *fwnode; struct phylink_pcs *pcs; @@ -1287,7 +1286,7 @@ static int stmmac_phy_setup(struct stmmac_priv *priv) /* Set the platform/firmware specified interface mode. Note, phylink * deals with the PHY interface mode, not the MAC interface mode. */ - __set_bit(mode, config->supported_interfaces); + __set_bit(priv->plat->phy_interface, config->supported_interfaces); /* If we have an xpcs, it defines which PHY interfaces are supported. */ if (priv->hw->xpcs) @@ -1315,7 +1314,8 @@ static int stmmac_phy_setup(struct stmmac_priv *priv) if (!fwnode) fwnode = dev_fwnode(priv->device); - phylink = phylink_create(config, fwnode, mode, &stmmac_phylink_mac_ops); + phylink = phylink_create(config, fwnode, priv->plat->phy_interface, + &stmmac_phylink_mac_ops); if (IS_ERR(phylink)) return PTR_ERR(phylink);