aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/mv643xx_eth.c
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2008-10-01 11:41:33 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-08 19:27:49 -0400
commit18ee49ddb0d242ed1d0e273038d5e4f6de7379d3 (patch)
tree8d935cda154204171628cee535f83a992aa66ef9 /drivers/net/mv643xx_eth.c
parent236bb5e649c2a7e8398b87df5e643368408afb4a (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/mv643xx_eth.c')
-rw-r--r--drivers/net/mv643xx_eth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 372811ade9f5..634008154480 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -2368,7 +2368,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
2368 msp->smi_bus.read = smi_bus_read; 2368 msp->smi_bus.read = smi_bus_read;
2369 msp->smi_bus.write = smi_bus_write, 2369 msp->smi_bus.write = smi_bus_write,
2370 snprintf(msp->smi_bus.id, MII_BUS_ID_SIZE, "%d", pdev->id); 2370 snprintf(msp->smi_bus.id, MII_BUS_ID_SIZE, "%d", pdev->id);
2371 msp->smi_bus.dev = &pdev->dev; 2371 msp->smi_bus.parent = &pdev->dev;
2372 msp->smi_bus.phy_mask = 0xffffffff; 2372 msp->smi_bus.phy_mask = 0xffffffff;
2373 if (mdiobus_register(&msp->smi_bus) < 0) 2373 if (mdiobus_register(&msp->smi_bus) < 0)
2374 goto out_unmap; 2374 goto out_unmap;