Commit 1a37c1c1 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: clean up passing fwnode to phylink 



Move the initialisation of the fwnode variable closer to its use
site, rather than scattered throughout stmmac_phy_setup().

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/E1qZAXD-005pTv-TN@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e80af2ac

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+5 −4
Original line number Diff line number Diff line
@@ -1200,9 +1200,9 @@ 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 = priv->plat->mdio_bus_data;

	struct fwnode_handle *fwnode = priv->plat->port_node;

	int max_speed = priv->plat->max_speed;

	int mode = priv->plat->phy_interface;

	struct fwnode_handle *fwnode;

	struct phylink *phylink;



	priv->phylink_config.dev = &priv->dev->dev;
@@ -1211,9 +1211,6 @@ static int stmmac_phy_setup(struct stmmac_priv *priv) 
		priv->phylink_config.ovr_an_inband =

			mdio_bus_data->xpcs_an_inband;



	if (!fwnode)

		fwnode = dev_fwnode(priv->device);



	/* Set the platform/firmware specified interface mode */

	__set_bit(mode, priv->phylink_config.supported_interfaces);
@@ -1254,6 +1251,10 @@ static int stmmac_phy_setup(struct stmmac_priv *priv) 
			~(MAC_10HD | MAC_100HD | MAC_1000HD);

	priv->phylink_config.mac_managed_pm = true;



	fwnode = priv->plat->port_node;

	if (!fwnode)

		fwnode = dev_fwnode(priv->device);



	phylink = phylink_create(&priv->phylink_config, fwnode,

				 mode, &stmmac_phylink_mac_ops);

	if (IS_ERR(phylink))