net: stmmac: drop the phy_reset hook from struct stmmac_mdio_bus_data

The phy_reset hook is not set anywhere. Drop it to make
stmmac_mdio_reset() smaller.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index c9454cf4f189fb64bc5d63e9f55f42c6880a015f..14aa3ee14082659ae48134042f8e84e802a3ce2d 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -247,7 +247,6 @@ int stmmac_mdio_reset(struct mii_bus *bus)
        struct net_device *ndev = bus->priv;
        struct stmmac_priv *priv = netdev_priv(ndev);
        unsigned int mii_address = priv->hw->mii.addr;
-       struct stmmac_mdio_bus_data *data = priv->plat->mdio_bus_data;
 
 #ifdef CONFIG_OF
        if (priv->device->of_node) {
@@ -277,11 +276,6 @@ int stmmac_mdio_reset(struct mii_bus *bus)
        }
 #endif
 
-       if (data->phy_reset) {
-               netdev_dbg(ndev, "stmmac_mdio_reset: calling phy_reset\n");
-               data->phy_reset(priv->plat->bsp_priv);
-       }
-
        /* This is a workaround for problems with the STE101P PHY.
         * It doesn't complete its reset until at least one clock cycle
         * on MDC, so perform a dummy mdio read. To be updated for GMAC4

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 7c8328edd501b6d03b45e135f1106933921535a3..6dfb5aa75b0ca20f7a03eb8104ccb29bd3797ebd 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -92,7 +92,6 @@
 /* Platfrom data for platform device structure's platform_data field */
 
 struct stmmac_mdio_bus_data {
-       int (*phy_reset)(void *priv);
        unsigned int phy_mask;
        int *irqs;
        int probed_phy_irq;