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/fs_enet | |
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/fs_enet')
-rw-r--r-- | drivers/net/fs_enet/mii-bitbang.c | 2 | ||||
-rw-r--r-- | drivers/net/fs_enet/mii-fec.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/fs_enet/mii-bitbang.c index be4b72f4f49a..2774252c2352 100644 --- a/drivers/net/fs_enet/mii-bitbang.c +++ b/drivers/net/fs_enet/mii-bitbang.c | |||
@@ -203,7 +203,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev, | |||
203 | if (!strcmp(np->type, "ethernet-phy")) | 203 | if (!strcmp(np->type, "ethernet-phy")) |
204 | add_phy(new_bus, np); | 204 | add_phy(new_bus, np); |
205 | 205 | ||
206 | new_bus->dev = &ofdev->dev; | 206 | new_bus->parent = &ofdev->dev; |
207 | dev_set_drvdata(&ofdev->dev, new_bus); | 207 | dev_set_drvdata(&ofdev->dev, new_bus); |
208 | 208 | ||
209 | ret = mdiobus_register(new_bus); | 209 | ret = mdiobus_register(new_bus); |
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c index 695f74cc4398..4d89a22317ac 100644 --- a/drivers/net/fs_enet/mii-fec.c +++ b/drivers/net/fs_enet/mii-fec.c | |||
@@ -172,7 +172,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev, | |||
172 | if (!strcmp(np->type, "ethernet-phy")) | 172 | if (!strcmp(np->type, "ethernet-phy")) |
173 | add_phy(new_bus, np); | 173 | add_phy(new_bus, np); |
174 | 174 | ||
175 | new_bus->dev = &ofdev->dev; | 175 | new_bus->parent = &ofdev->dev; |
176 | dev_set_drvdata(&ofdev->dev, new_bus); | 176 | dev_set_drvdata(&ofdev->dev, new_bus); |
177 | 177 | ||
178 | ret = mdiobus_register(new_bus); | 178 | ret = mdiobus_register(new_bus); |