aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tc35815.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/tc35815.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/tc35815.c')
-rw-r--r--drivers/net/tc35815.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index 8487ace9d2e3..1f2b1f2d73ae 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -768,7 +768,7 @@ static int tc_mii_init(struct net_device *dev)
768 snprintf(lp->mii_bus.id, MII_BUS_ID_SIZE, "%x", 768 snprintf(lp->mii_bus.id, MII_BUS_ID_SIZE, "%x",
769 (lp->pci_dev->bus->number << 8) | lp->pci_dev->devfn); 769 (lp->pci_dev->bus->number << 8) | lp->pci_dev->devfn);
770 lp->mii_bus.priv = dev; 770 lp->mii_bus.priv = dev;
771 lp->mii_bus.dev = &lp->pci_dev->dev; 771 lp->mii_bus.parent = &lp->pci_dev->dev;
772 lp->mii_bus.irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL); 772 lp->mii_bus.irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
773 if (!lp->mii_bus.irq) { 773 if (!lp->mii_bus.irq) {
774 err = -ENOMEM; 774 err = -ENOMEM;