aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-03-23 00:22:48 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-23 00:22:48 -0400
commit6580f57d485f70851218813fa053d971915f61fb (patch)
tree3223d8daad2e81a82b040273b389b8d64f74fbe8
parent4b97926ddf51b3919c859e2086fef3c8c3c46c61 (diff)
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 5c347f70cb67..1b4063222a82 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -280,11 +280,11 @@ static int dnet_mii_probe(struct net_device *dev)
280 280
281 /* attach the mac to the phy */ 281 /* attach the mac to the phy */
282 if (bp->capabilities & DNET_HAS_RMII) { 282 if (bp->capabilities & DNET_HAS_RMII) {
283 phydev = phy_connect(dev, phydev->dev.bus_id, 283 phydev = phy_connect(dev, dev_name(&phydev->dev),
284 &dnet_handle_link_change, 0, 284 &dnet_handle_link_change, 0,
285 PHY_INTERFACE_MODE_RMII); 285 PHY_INTERFACE_MODE_RMII);
286 } else { 286 } else {
287 phydev = phy_connect(dev, phydev->dev.bus_id, 287 phydev = phy_connect(dev, dev_name(&phydev->dev),
288 &dnet_handle_link_change, 0, 288 &dnet_handle_link_change, 0,
289 PHY_INTERFACE_MODE_MII); 289 PHY_INTERFACE_MODE_MII);
290 } 290 }
@@ -927,7 +927,7 @@ static int __devinit dnet_probe(struct platform_device *pdev)
927 phydev = bp->phy_dev; 927 phydev = bp->phy_dev;
928 dev_info(&pdev->dev, "attached PHY driver [%s] " 928 dev_info(&pdev->dev, "attached PHY driver [%s] "
929 "(mii_bus:phy_addr=%s, irq=%d)\n", 929 "(mii_bus:phy_addr=%s, irq=%d)\n",
930 phydev->drv->name, phydev->dev.bus_id, phydev->irq); 930 phydev->drv->name, dev_name(&phydev->dev), phydev->irq);
931 931
932 return 0; 932 return 0;
933 933