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

Commit 8b63ec18 authored by David Daney's avatar David Daney Committed by David S. Miller
Browse files

phylib: Make PHYs children of their MDIO bus, not the bus' parent. 



commit 18ee49dd ("phylib: rename mii_bus::dev to mii_bus::parent")
changed the parent of PHY devices from the bus to the bus parent.

Then, commit 4dea547f ("phylib: rework to prepare for OF
registration of PHYs") moved the code into phy_device.c

At this point, it is somewhat unclear why the change was seen as
necessary.  But, when we look at the device model tree in
/sys/devices, it is clearly incorrect.  The PHYs should be children of
their MDIO bus.

Change the PHY's parent device to be the MDIO bus device.

Cc: Lennert Buytenhek <buytenh@wantstofly.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba51b6be

drivers/net/phy/phy_device.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, int phy_id, 
	if (c45_ids)

		dev->c45_ids = *c45_ids;

	dev->bus = bus;

	dev->dev.parent = bus->parent;

	dev->dev.parent = &bus->dev;

	dev->dev.bus = &mdio_bus_type;

	dev->irq = bus->irq != NULL ? bus->irq[addr] : PHY_POLL;

	dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);