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

Commit e1250037 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mdio_reset-next' 



Florian Fainelli says:

====================
net: remove empty MDIO bus reset functions

This patchset removes all empty MDIO bus reset functions that we have in the
tree (hopefully all of them). This function is optional for the MDIO bus code in
drivers/net/phy/mdio_bus.c::mdiobus_register, the documentation is updated to
reflect that.

Having less call sites to update will allow us to implement a generic BMCR_RESET
based PHY reset for MDIO buses that require to reset their PHYs before their
PHY detection succeeds (e.g: HiSilicon hip04 current submission) and provide it
as a helper.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ebe5e3c6 604fdf42

Documentation/networking/phy.txt

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ The MDIO bus 
   time, so it is safe for them to block, waiting for an interrupt to signal

   the operation is complete

 

 2) A reset function is necessary.  This is used to return the bus to an

 2) A reset function is optional.  This is used to return the bus to an

   initialized state.



 3) A probe function is needed.  This function should set up anything the bus

drivers/net/ethernet/adi/bfin_mac.c

+0 −6
Original line number Diff line number Diff line
@@ -307,11 +307,6 @@ static int bfin_mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum, 
	return bfin_mdio_poll();

}



static int bfin_mdiobus_reset(struct mii_bus *bus)

{

	return 0;

}



static void bfin_mac_adjust_link(struct net_device *dev)

{

	struct bfin_mac_local *lp = netdev_priv(dev);
@@ -1824,7 +1819,6 @@ static int bfin_mii_bus_probe(struct platform_device *pdev) 
		goto out_err_alloc;

	miibus->read = bfin_mdiobus_read;

	miibus->write = bfin_mdiobus_write;

	miibus->reset = bfin_mdiobus_reset;



	miibus->parent = &pdev->dev;

	miibus->name = "bfin_mii_bus";

drivers/net/ethernet/aeroflex/greth.c

+0 −6
Original line number Diff line number Diff line
@@ -1213,11 +1213,6 @@ static int greth_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val) 
	return 0;

}



static int greth_mdio_reset(struct mii_bus *bus)

{

	return 0;

}



static void greth_link_change(struct net_device *dev)

{

	struct greth_private *greth = netdev_priv(dev);
@@ -1332,7 +1327,6 @@ static int greth_mdio_init(struct greth_private *greth) 
	snprintf(greth->mdio->id, MII_BUS_ID_SIZE, "%s-%d", greth->mdio->name, greth->irq);

	greth->mdio->read = greth_mdio_read;

	greth->mdio->write = greth_mdio_write;

	greth->mdio->reset = greth_mdio_reset;

	greth->mdio->priv = greth;



	greth->mdio->irq = greth->mdio_irqs;

drivers/net/ethernet/broadcom/tg3.c

+0 −6
Original line number Diff line number Diff line
@@ -1401,11 +1401,6 @@ static int tg3_mdio_write(struct mii_bus *bp, int mii_id, int reg, u16 val) 
	return ret;

}



static int tg3_mdio_reset(struct mii_bus *bp)

{

	return 0;

}



static void tg3_mdio_config_5785(struct tg3 *tp)

{

	u32 val;
@@ -1542,7 +1537,6 @@ static int tg3_mdio_init(struct tg3 *tp) 
	tp->mdio_bus->parent   = &tp->pdev->dev;

	tp->mdio_bus->read     = &tg3_mdio_read;

	tp->mdio_bus->write    = &tg3_mdio_write;

	tp->mdio_bus->reset    = &tg3_mdio_reset;

	tp->mdio_bus->phy_mask = ~(1 << tp->phy_addr);

	tp->mdio_bus->irq      = &tp->mdio_irq[0];

drivers/net/ethernet/cadence/macb.c

+0 −6
Original line number Diff line number Diff line
@@ -199,11 +199,6 @@ static int macb_mdio_write(struct mii_bus *bus, int mii_id, int regnum, 
	return 0;

}



static int macb_mdio_reset(struct mii_bus *bus)

{

	return 0;

}



/**

 * macb_set_tx_clk() - Set a clock to a new frequency

 * @clk		Pointer to the clock to change
@@ -375,7 +370,6 @@ int macb_mii_init(struct macb *bp) 
	bp->mii_bus->name = "MACB_mii_bus";

	bp->mii_bus->read = &macb_mdio_read;

	bp->mii_bus->write = &macb_mdio_write;

	bp->mii_bus->reset = &macb_mdio_reset;

	snprintf(bp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",

		bp->pdev->name, bp->pdev->id);

	bp->mii_bus->priv = bp;