aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/smsc9420.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-01-27 00:12:58 -0500
committerDavid S. Miller <davem@davemloft.net>2009-01-27 00:12:58 -0500
commitdb1d7bf70f42124f73675fca62fe32f3ab1111b4 (patch)
treefc6d52f9c898585ddaea22e2775267d3eb389617 /drivers/net/smsc9420.c
parent3617aa485c7394e20fdaf356b1b78516fcaaa0d1 (diff)
net: struct device - replace bus_id with dev_name(), dev_set_name()
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/smsc9420.c')
-rw-r--r--drivers/net/smsc9420.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/smsc9420.c b/drivers/net/smsc9420.c
index 79f4c228b030..ce4e2e864bc7 100644
--- a/drivers/net/smsc9420.c
+++ b/drivers/net/smsc9420.c
@@ -1156,7 +1156,7 @@ static int smsc9420_mii_probe(struct net_device *dev)
1156 smsc_info(PROBE, "PHY addr %d, phy_id 0x%08X", phydev->addr, 1156 smsc_info(PROBE, "PHY addr %d, phy_id 0x%08X", phydev->addr,
1157 phydev->phy_id); 1157 phydev->phy_id);
1158 1158
1159 phydev = phy_connect(dev, phydev->dev.bus_id, 1159 phydev = phy_connect(dev, dev_name(&phydev->dev),
1160 &smsc9420_phy_adjust_link, 0, PHY_INTERFACE_MODE_MII); 1160 &smsc9420_phy_adjust_link, 0, PHY_INTERFACE_MODE_MII);
1161 1161
1162 if (IS_ERR(phydev)) { 1162 if (IS_ERR(phydev)) {
@@ -1165,7 +1165,7 @@ static int smsc9420_mii_probe(struct net_device *dev)
1165 } 1165 }
1166 1166
1167 pr_info("%s: attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n", 1167 pr_info("%s: attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",
1168 dev->name, phydev->drv->name, phydev->dev.bus_id, phydev->irq); 1168 dev->name, phydev->drv->name, dev_name(&phydev->dev), phydev->irq);
1169 1169
1170 /* mask with MAC supported features */ 1170 /* mask with MAC supported features */
1171 phydev->supported &= (PHY_BASIC_FEATURES | SUPPORTED_Pause | 1171 phydev->supported &= (PHY_BASIC_FEATURES | SUPPORTED_Pause |