diff options
Diffstat (limited to 'drivers/net/macb.c')
-rw-r--r-- | drivers/net/macb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index dc33d51213d7..872c1bdf42bd 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c | |||
@@ -211,10 +211,10 @@ static int macb_mii_probe(struct net_device *dev) | |||
211 | 211 | ||
212 | /* attach the mac to the phy */ | 212 | /* attach the mac to the phy */ |
213 | if (pdata && pdata->is_rmii) { | 213 | if (pdata && pdata->is_rmii) { |
214 | phydev = phy_connect(dev, phydev->dev.bus_id, | 214 | phydev = phy_connect(dev, dev_name(&phydev->dev), |
215 | &macb_handle_link_change, 0, PHY_INTERFACE_MODE_RMII); | 215 | &macb_handle_link_change, 0, PHY_INTERFACE_MODE_RMII); |
216 | } else { | 216 | } else { |
217 | phydev = phy_connect(dev, phydev->dev.bus_id, | 217 | phydev = phy_connect(dev, dev_name(&phydev->dev), |
218 | &macb_handle_link_change, 0, PHY_INTERFACE_MODE_MII); | 218 | &macb_handle_link_change, 0, PHY_INTERFACE_MODE_MII); |
219 | } | 219 | } |
220 | 220 | ||
@@ -1077,7 +1077,7 @@ static void macb_get_drvinfo(struct net_device *dev, | |||
1077 | 1077 | ||
1078 | strcpy(info->driver, bp->pdev->dev.driver->name); | 1078 | strcpy(info->driver, bp->pdev->dev.driver->name); |
1079 | strcpy(info->version, "$Revision: 1.14 $"); | 1079 | strcpy(info->version, "$Revision: 1.14 $"); |
1080 | strcpy(info->bus_info, bp->pdev->dev.bus_id); | 1080 | strcpy(info->bus_info, dev_name(&bp->pdev->dev)); |
1081 | } | 1081 | } |
1082 | 1082 | ||
1083 | static struct ethtool_ops macb_ethtool_ops = { | 1083 | static struct ethtool_ops macb_ethtool_ops = { |
@@ -1234,8 +1234,8 @@ static int __init macb_probe(struct platform_device *pdev) | |||
1234 | 1234 | ||
1235 | phydev = bp->phy_dev; | 1235 | phydev = bp->phy_dev; |
1236 | printk(KERN_INFO "%s: attached PHY driver [%s] " | 1236 | printk(KERN_INFO "%s: attached PHY driver [%s] " |
1237 | "(mii_bus:phy_addr=%s, irq=%d)\n", | 1237 | "(mii_bus:phy_addr=%s, irq=%d)\n", dev->name, |
1238 | dev->name, phydev->drv->name, phydev->dev.bus_id, phydev->irq); | 1238 | phydev->drv->name, dev_name(&phydev->dev), phydev->irq); |
1239 | 1239 | ||
1240 | return 0; | 1240 | return 0; |
1241 | 1241 | ||