Commit 2b070cdd authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski

net: stmmac: use "mdio_bus_data" local variable

We have a local variable for priv->plat->mdio_bus_data, which we use
later in the conditional if() block, but we evaluate the above within
the conditional expression. Use mdio_bus_data instead. Since these
will be the only two users of this local variable, move its assignment
just before the if().
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/E1qZAXJ-005pU1-1z@rmk-PC.armlinux.org.ukSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1a37c1c1
...@@ -1199,7 +1199,7 @@ static int stmmac_init_phy(struct net_device *dev) ...@@ -1199,7 +1199,7 @@ static int stmmac_init_phy(struct net_device *dev)
static int stmmac_phy_setup(struct stmmac_priv *priv) static int stmmac_phy_setup(struct stmmac_priv *priv)
{ {
struct stmmac_mdio_bus_data *mdio_bus_data = priv->plat->mdio_bus_data; struct stmmac_mdio_bus_data *mdio_bus_data;
int max_speed = priv->plat->max_speed; int max_speed = priv->plat->max_speed;
int mode = priv->plat->phy_interface; int mode = priv->plat->phy_interface;
struct fwnode_handle *fwnode; struct fwnode_handle *fwnode;
...@@ -1207,7 +1207,9 @@ static int stmmac_phy_setup(struct stmmac_priv *priv) ...@@ -1207,7 +1207,9 @@ static int stmmac_phy_setup(struct stmmac_priv *priv)
priv->phylink_config.dev = &priv->dev->dev; priv->phylink_config.dev = &priv->dev->dev;
priv->phylink_config.type = PHYLINK_NETDEV; priv->phylink_config.type = PHYLINK_NETDEV;
if (priv->plat->mdio_bus_data)
mdio_bus_data = priv->plat->mdio_bus_data;
if (mdio_bus_data)
priv->phylink_config.ovr_an_inband = priv->phylink_config.ovr_an_inband =
mdio_bus_data->xpcs_an_inband; mdio_bus_data->xpcs_an_inband;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment