Commit 727e373f authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski

net: stmmac: use xpcs_create_mdiodev()

Use the new xpcs_create_mdiodev() creator, which simplifies the
creation and destruction of the mdio device associated with xpcs.
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9a5d500c
...@@ -491,7 +491,6 @@ int stmmac_mdio_reset(struct mii_bus *bus) ...@@ -491,7 +491,6 @@ int stmmac_mdio_reset(struct mii_bus *bus)
int stmmac_xpcs_setup(struct mii_bus *bus) int stmmac_xpcs_setup(struct mii_bus *bus)
{ {
struct net_device *ndev = bus->priv; struct net_device *ndev = bus->priv;
struct mdio_device *mdiodev;
struct stmmac_priv *priv; struct stmmac_priv *priv;
struct dw_xpcs *xpcs; struct dw_xpcs *xpcs;
int mode, addr; int mode, addr;
...@@ -501,16 +500,10 @@ int stmmac_xpcs_setup(struct mii_bus *bus) ...@@ -501,16 +500,10 @@ int stmmac_xpcs_setup(struct mii_bus *bus)
/* Try to probe the XPCS by scanning all addresses. */ /* Try to probe the XPCS by scanning all addresses. */
for (addr = 0; addr < PHY_MAX_ADDR; addr++) { for (addr = 0; addr < PHY_MAX_ADDR; addr++) {
mdiodev = mdio_device_create(bus, addr); xpcs = xpcs_create_mdiodev(bus, addr, mode);
if (IS_ERR(mdiodev)) if (IS_ERR(xpcs))
continue; continue;
xpcs = xpcs_create(mdiodev, mode);
if (IS_ERR_OR_NULL(xpcs)) {
mdio_device_free(mdiodev);
continue;
}
priv->hw->xpcs = xpcs; priv->hw->xpcs = xpcs;
break; break;
} }
...@@ -669,10 +662,8 @@ int stmmac_mdio_unregister(struct net_device *ndev) ...@@ -669,10 +662,8 @@ int stmmac_mdio_unregister(struct net_device *ndev)
if (!priv->mii) if (!priv->mii)
return 0; return 0;
if (priv->hw->xpcs) { if (priv->hw->xpcs)
mdio_device_free(priv->hw->xpcs->mdiodev);
xpcs_destroy(priv->hw->xpcs); xpcs_destroy(priv->hw->xpcs);
}
mdiobus_unregister(priv->mii); mdiobus_unregister(priv->mii);
priv->mii->priv = NULL; priv->mii->priv = NULL;
......
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