summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-03-22 21:22:48 -0700
committerDavid S. Miller <davem@davemloft.net>2009-03-22 21:22:48 -0700
commit6580f57d485f70851218813fa053d971915f61fb (patch)
tree3223d8daad2e81a82b040273b389b8d64f74fbe8
parent4b97926ddf51b3919c859e2086fef3c8c3c46c61 (diff)
downloadlinux-3.10-6580f57d485f70851218813fa053d971915f61fb.tar.gz
linux-3.10-6580f57d485f70851218813fa053d971915f61fb.tar.bz2
linux-3.10-6580f57d485f70851218813fa053d971915f61fb.zip
net: update dnet.c for bus_id removal
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/dnet.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 5c347f70cb6..1b4063222a8 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -280,11 +280,11 @@ static int dnet_mii_probe(struct net_device *dev)
/* attach the mac to the phy */
if (bp->capabilities & DNET_HAS_RMII) {
- phydev = phy_connect(dev, phydev->dev.bus_id,
+ phydev = phy_connect(dev, dev_name(&phydev->dev),
&dnet_handle_link_change, 0,
PHY_INTERFACE_MODE_RMII);
} else {
- phydev = phy_connect(dev, phydev->dev.bus_id,
+ phydev = phy_connect(dev, dev_name(&phydev->dev),
&dnet_handle_link_change, 0,
PHY_INTERFACE_MODE_MII);
}
@@ -927,7 +927,7 @@ static int __devinit dnet_probe(struct platform_device *pdev)
phydev = bp->phy_dev;
dev_info(&pdev->dev, "attached PHY driver [%s] "
"(mii_bus:phy_addr=%s, irq=%d)\n",
- phydev->drv->name, phydev->dev.bus_id, phydev->irq);
+ phydev->drv->name, dev_name(&phydev->dev), phydev->irq);
return 0;