diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-03-24 19:38:22 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 19:38:22 -0400 |
commit | c23135573f37facd18edb2e8e8512c67928c54ac (patch) | |
tree | 1fd3852a257318ba31af2f6f302d7abc8f874dd9 /drivers/net/smsc9420.c | |
parent | 744bcb13d376b38ff1df3bbcc810493e1b999502 (diff) |
net: struct device - replace bus_id with dev_name(), dev_set_name()
Cc: davem@davemloft.net
Cc: netdev@vger.kernel.org
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Diffstat (limited to 'drivers/net/smsc9420.c')
-rw-r--r-- | drivers/net/smsc9420.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/smsc9420.c b/drivers/net/smsc9420.c index 4e15ae068b3f..72f1348eb809 100644 --- a/drivers/net/smsc9420.c +++ b/drivers/net/smsc9420.c | |||
@@ -1160,7 +1160,7 @@ static int smsc9420_mii_probe(struct net_device *dev) | |||
1160 | smsc_info(PROBE, "PHY addr %d, phy_id 0x%08X", phydev->addr, | 1160 | smsc_info(PROBE, "PHY addr %d, phy_id 0x%08X", phydev->addr, |
1161 | phydev->phy_id); | 1161 | phydev->phy_id); |
1162 | 1162 | ||
1163 | phydev = phy_connect(dev, phydev->dev.bus_id, | 1163 | phydev = phy_connect(dev, dev_name(&phydev->dev), |
1164 | &smsc9420_phy_adjust_link, 0, PHY_INTERFACE_MODE_MII); | 1164 | &smsc9420_phy_adjust_link, 0, PHY_INTERFACE_MODE_MII); |
1165 | 1165 | ||
1166 | if (IS_ERR(phydev)) { | 1166 | if (IS_ERR(phydev)) { |
@@ -1169,7 +1169,7 @@ static int smsc9420_mii_probe(struct net_device *dev) | |||
1169 | } | 1169 | } |
1170 | 1170 | ||
1171 | pr_info("%s: attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n", | 1171 | pr_info("%s: attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n", |
1172 | dev->name, phydev->drv->name, phydev->dev.bus_id, phydev->irq); | 1172 | dev->name, phydev->drv->name, dev_name(&phydev->dev), phydev->irq); |
1173 | 1173 | ||
1174 | /* mask with MAC supported features */ | 1174 | /* mask with MAC supported features */ |
1175 | phydev->supported &= (PHY_BASIC_FEATURES | SUPPORTED_Pause | | 1175 | phydev->supported &= (PHY_BASIC_FEATURES | SUPPORTED_Pause | |