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/sb1250-mac.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/sb1250-mac.c')
-rw-r--r-- | drivers/net/sb1250-mac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index ce10cfa1ee53..d0ee735590bb 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/sb1250-mac.c | |||
@@ -2378,7 +2378,7 @@ static int sbmac_init(struct platform_device *pldev, long long base) | |||
2378 | for (i = 0; i < PHY_MAX_ADDR; ++i) | 2378 | for (i = 0; i < PHY_MAX_ADDR; ++i) |
2379 | sc->mii_bus.irq[i] = SBMAC_PHY_INT; | 2379 | sc->mii_bus.irq[i] = SBMAC_PHY_INT; |
2380 | 2380 | ||
2381 | sc->mii_bus.dev = &pldev->dev; | 2381 | sc->mii_bus.parent = &pldev->dev; |
2382 | dev_set_drvdata(&pldev->dev, &sc->mii_bus); | 2382 | dev_set_drvdata(&pldev->dev, &sc->mii_bus); |
2383 | 2383 | ||
2384 | return 0; | 2384 | return 0; |