diff options
Diffstat (limited to 'drivers/net/smsc911x.c')
-rw-r--r-- | drivers/net/smsc911x.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index d1590ac55e4b..ab18ee0f60f3 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c | |||
@@ -769,7 +769,7 @@ static int smsc911x_mii_probe(struct net_device *dev) | |||
769 | return -ENODEV; | 769 | return -ENODEV; |
770 | } | 770 | } |
771 | 771 | ||
772 | phydev = phy_connect(dev, phydev->dev.bus_id, | 772 | phydev = phy_connect(dev, dev_name(&phydev->dev), |
773 | &smsc911x_phy_adjust_link, 0, pdata->config.phy_interface); | 773 | &smsc911x_phy_adjust_link, 0, pdata->config.phy_interface); |
774 | 774 | ||
775 | if (IS_ERR(phydev)) { | 775 | if (IS_ERR(phydev)) { |
@@ -778,7 +778,8 @@ static int smsc911x_mii_probe(struct net_device *dev) | |||
778 | } | 778 | } |
779 | 779 | ||
780 | pr_info("%s: attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n", | 780 | pr_info("%s: attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n", |
781 | dev->name, phydev->drv->name, phydev->dev.bus_id, phydev->irq); | 781 | dev->name, phydev->drv->name, |
782 | dev_name(&phydev->dev), phydev->irq); | ||
782 | 783 | ||
783 | /* mask with MAC supported features */ | 784 | /* mask with MAC supported features */ |
784 | phydev->supported &= (PHY_BASIC_FEATURES | SUPPORTED_Pause | | 785 | phydev->supported &= (PHY_BASIC_FEATURES | SUPPORTED_Pause | |
@@ -1549,7 +1550,7 @@ static void smsc911x_ethtool_getdrvinfo(struct net_device *dev, | |||
1549 | { | 1550 | { |
1550 | strlcpy(info->driver, SMSC_CHIPNAME, sizeof(info->driver)); | 1551 | strlcpy(info->driver, SMSC_CHIPNAME, sizeof(info->driver)); |
1551 | strlcpy(info->version, SMSC_DRV_VERSION, sizeof(info->version)); | 1552 | strlcpy(info->version, SMSC_DRV_VERSION, sizeof(info->version)); |
1552 | strlcpy(info->bus_info, dev->dev.parent->bus_id, | 1553 | strlcpy(info->bus_info, dev_name(dev->dev.parent), |
1553 | sizeof(info->bus_info)); | 1554 | sizeof(info->bus_info)); |
1554 | } | 1555 | } |
1555 | 1556 | ||