diff options
author | Martin Blumenstingl <martin.blumenstingl@googlemail.com> | 2019-06-15 06:09:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-06-16 16:53:41 -0400 |
commit | fead5b1b5838ba2f231d76e1b8ed31a4e9449382 (patch) | |
tree | 80727e05f98877465b92a228f1f9b2801e096c70 | |
parent | ce4ab73ab0c27c6a3853695aa8ec0f453c6329cd (diff) |
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>
-rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 6 | ||||
-rw-r--r-- | include/linux/stmmac.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c index c9454cf4f189..14aa3ee14082 100644 --- 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) | |||
247 | struct net_device *ndev = bus->priv; | 247 | struct net_device *ndev = bus->priv; |
248 | struct stmmac_priv *priv = netdev_priv(ndev); | 248 | struct stmmac_priv *priv = netdev_priv(ndev); |
249 | unsigned int mii_address = priv->hw->mii.addr; | 249 | unsigned int mii_address = priv->hw->mii.addr; |
250 | struct stmmac_mdio_bus_data *data = priv->plat->mdio_bus_data; | ||
251 | 250 | ||
252 | #ifdef CONFIG_OF | 251 | #ifdef CONFIG_OF |
253 | if (priv->device->of_node) { | 252 | if (priv->device->of_node) { |
@@ -277,11 +276,6 @@ int stmmac_mdio_reset(struct mii_bus *bus) | |||
277 | } | 276 | } |
278 | #endif | 277 | #endif |
279 | 278 | ||
280 | if (data->phy_reset) { | ||
281 | netdev_dbg(ndev, "stmmac_mdio_reset: calling phy_reset\n"); | ||
282 | data->phy_reset(priv->plat->bsp_priv); | ||
283 | } | ||
284 | |||
285 | /* This is a workaround for problems with the STE101P PHY. | 279 | /* This is a workaround for problems with the STE101P PHY. |
286 | * It doesn't complete its reset until at least one clock cycle | 280 | * It doesn't complete its reset until at least one clock cycle |
287 | * on MDC, so perform a dummy mdio read. To be updated for GMAC4 | 281 | * 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 7c8328edd501..6dfb5aa75b0c 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h | |||
@@ -92,7 +92,6 @@ | |||
92 | /* Platfrom data for platform device structure's platform_data field */ | 92 | /* Platfrom data for platform device structure's platform_data field */ |
93 | 93 | ||
94 | struct stmmac_mdio_bus_data { | 94 | struct stmmac_mdio_bus_data { |
95 | int (*phy_reset)(void *priv); | ||
96 | unsigned int phy_mask; | 95 | unsigned int phy_mask; |
97 | int *irqs; | 96 | int *irqs; |
98 | int probed_phy_irq; | 97 | int probed_phy_irq; |