Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fead5b1b authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by David S. Miller
Browse files

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: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ce4ab73a

drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -247,7 +247,6 @@ int stmmac_mdio_reset(struct mii_bus *bus) 
	struct net_device *ndev = bus->priv;

	struct net_device *ndev = bus->priv;

	struct stmmac_priv *priv = netdev_priv(ndev);

	struct stmmac_priv *priv = netdev_priv(ndev);

	unsigned int mii_address = priv->hw->mii.addr;

	unsigned int mii_address = priv->hw->mii.addr;

	struct stmmac_mdio_bus_data *data = priv->plat->mdio_bus_data;





#ifdef CONFIG_OF

#ifdef CONFIG_OF

	if (priv->device->of_node) {

	if (priv->device->of_node) {
@@ -277,11 +276,6 @@ int stmmac_mdio_reset(struct mii_bus *bus) 
	}

	}

#endif

#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.

	/* This is a workaround for problems with the STE101P PHY.

	 * It doesn't complete its reset until at least one clock cycle

	 * 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

	 * on MDC, so perform a dummy mdio read. To be updated for GMAC4

include/linux/stmmac.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -92,7 +92,6 @@ 
/* Platfrom data for platform device structure's platform_data field */

/* Platfrom data for platform device structure's platform_data field */





struct stmmac_mdio_bus_data {

struct stmmac_mdio_bus_data {

	int (*phy_reset)(void *priv);

	unsigned int phy_mask;

	unsigned int phy_mask;

	int *irqs;

	int *irqs;

	int probed_phy_irq;

	int probed_phy_irq;