Skip to content

Commit

Permalink
net: stmmac: drop the phy_reset hook from struct stmmac_mdio_bus_data
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Martin Blumenstingl authored and David S. Miller committed Jun 16, 2019
1 parent ce4ab73 commit fead5b1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
6 changes: 0 additions & 6 deletions drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion include/linux/stmmac.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit fead5b1

Please sign in to comment.