diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-10-01 11:41:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-08 19:27:49 -0400 |
commit | 18ee49ddb0d242ed1d0e273038d5e4f6de7379d3 (patch) | |
tree | 8d935cda154204171628cee535f83a992aa66ef9 /drivers/net/phy/mdio_bus.c | |
parent | 236bb5e649c2a7e8398b87df5e643368408afb4a (diff) |
phylib: rename mii_bus::dev to mii_bus::parent
In preparation of giving mii_bus objects a device tree presence of
their own, rename struct mii_bus's ->dev argument to ->parent, since
having a 'struct device *dev' that points to our parent device
conflicts with introducing a 'struct device dev' representing our own
device.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Andy Fleming <afleming@freescale.com>
Diffstat (limited to 'drivers/net/phy/mdio_bus.c')
-rw-r--r-- | drivers/net/phy/mdio_bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index e7508c10887c..a7211a32bb4a 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c | |||
@@ -107,7 +107,7 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr) | |||
107 | 107 | ||
108 | phydev->irq = bus->irq != NULL ? bus->irq[addr] : PHY_POLL; | 108 | phydev->irq = bus->irq != NULL ? bus->irq[addr] : PHY_POLL; |
109 | 109 | ||
110 | phydev->dev.parent = bus->dev; | 110 | phydev->dev.parent = bus->parent; |
111 | phydev->dev.bus = &mdio_bus_type; | 111 | phydev->dev.bus = &mdio_bus_type; |
112 | snprintf(phydev->dev.bus_id, BUS_ID_SIZE, PHY_ID_FMT, bus->id, addr); | 112 | snprintf(phydev->dev.bus_id, BUS_ID_SIZE, PHY_ID_FMT, bus->id, addr); |
113 | 113 | ||