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/tg3.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/tg3.c')
-rw-r--r-- | drivers/net/tg3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 123920759efd..4b8b75bcbde0 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -961,7 +961,7 @@ static int tg3_mdio_init(struct tg3 *tp) | |||
961 | snprintf(mdio_bus->id, MII_BUS_ID_SIZE, "%x", | 961 | snprintf(mdio_bus->id, MII_BUS_ID_SIZE, "%x", |
962 | (tp->pdev->bus->number << 8) | tp->pdev->devfn); | 962 | (tp->pdev->bus->number << 8) | tp->pdev->devfn); |
963 | mdio_bus->priv = tp; | 963 | mdio_bus->priv = tp; |
964 | mdio_bus->dev = &tp->pdev->dev; | 964 | mdio_bus->parent = &tp->pdev->dev; |
965 | mdio_bus->read = &tg3_mdio_read; | 965 | mdio_bus->read = &tg3_mdio_read; |
966 | mdio_bus->write = &tg3_mdio_write; | 966 | mdio_bus->write = &tg3_mdio_write; |
967 | mdio_bus->reset = &tg3_mdio_reset; | 967 | mdio_bus->reset = &tg3_mdio_reset; |