Skip to content

Commit

Permalink
net: update dnet.c for bus_id removal
Browse files Browse the repository at this point in the history
Signed-off-by: Stephen Rothwell <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
sfrothwell authored and davem330 committed Mar 23, 2009
1 parent 4b97926 commit 6580f57
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/dnet.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 6580f57

Please sign in to comment.