47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
|
--- a/drivers/net/ag71xx/ag71xx_ethtool.c
|
||
|
|
+++ b/drivers/net/ag71xx/ag71xx_ethtool.c
|
||
|
|
@@ -44,7 +44,7 @@ static void ag71xx_ethtool_get_drvinfo(s
|
||
|
|
|
||
|
|
strcpy(info->driver, ag->pdev->dev.driver->name);
|
||
|
|
strcpy(info->version, AG71XX_DRV_VERSION);
|
||
|
|
- strcpy(info->bus_info, ag->pdev->dev.bus_id);
|
||
|
|
+ strcpy(info->bus_info, dev_name(&ag->pdev->dev));
|
||
|
|
}
|
||
|
|
|
||
|
|
static u32 ag71xx_ethtool_get_msglevel(struct net_device *dev)
|
||
|
|
--- a/drivers/net/ag71xx/ag71xx_phy.c
|
||
|
|
+++ b/drivers/net/ag71xx/ag71xx_phy.c
|
||
|
|
@@ -213,7 +213,7 @@ static int ag71xx_phy_connect_multi(stru
|
||
|
|
|
||
|
|
DBG("%s: PHY found at %s, uid=%08x\n",
|
||
|
|
dev->name,
|
||
|
|
- ag->mii_bus->phy_map[phy_addr]->dev.bus_id,
|
||
|
|
+ dev_name(&ag->mii_bus->phy_map[phy_addr]->dev),
|
||
|
|
ag->mii_bus->phy_map[phy_addr]->phy_id);
|
||
|
|
|
||
|
|
if (phydev == NULL)
|
||
|
|
@@ -229,12 +229,12 @@ static int ag71xx_phy_connect_multi(stru
|
||
|
|
ret = -ENODEV;
|
||
|
|
break;
|
||
|
|
case 1:
|
||
|
|
- ag->phy_dev = phy_connect(dev, phydev->dev.bus_id,
|
||
|
|
+ ag->phy_dev = phy_connect(dev, dev_name(&phydev->dev),
|
||
|
|
&ag71xx_phy_link_adjust, 0, pdata->phy_if_mode);
|
||
|
|
|
||
|
|
if (IS_ERR(ag->phy_dev)) {
|
||
|
|
printk(KERN_ERR "%s: could not connect to PHY at %s\n",
|
||
|
|
- dev->name, phydev->dev.bus_id);
|
||
|
|
+ dev->name, dev_name(&phydev->dev));
|
||
|
|
return PTR_ERR(ag->phy_dev);
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -248,7 +248,7 @@ static int ag71xx_phy_connect_multi(stru
|
||
|
|
|
||
|
|
printk(KERN_DEBUG "%s: connected to PHY at %s "
|
||
|
|
"[uid=%08x, driver=%s]\n",
|
||
|
|
- dev->name, phydev->dev.bus_id,
|
||
|
|
+ dev->name, dev_name(&phydev->dev),
|
||
|
|
phydev->phy_id, phydev->drv->name);
|
||
|
|
|
||
|
|
ag->link = 0;
|