aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r--drivers/net/tg3.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 546b9eeaa171..e05849ee9000 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -1396,7 +1396,7 @@ static int tg3_phy_init(struct tg3 *tp)
1396 phydev = tp->mdio_bus->phy_map[PHY_ADDR]; 1396 phydev = tp->mdio_bus->phy_map[PHY_ADDR];
1397 1397
1398 /* Attach the MAC to the PHY. */ 1398 /* Attach the MAC to the PHY. */
1399 phydev = phy_connect(tp->dev, phydev->dev.bus_id, tg3_adjust_link, 1399 phydev = phy_connect(tp->dev, dev_name(&phydev->dev), tg3_adjust_link,
1400 phydev->dev_flags, phydev->interface); 1400 phydev->dev_flags, phydev->interface);
1401 if (IS_ERR(phydev)) { 1401 if (IS_ERR(phydev)) {
1402 printk(KERN_ERR "%s: Could not attach to PHY\n", tp->dev->name); 1402 printk(KERN_ERR "%s: Could not attach to PHY\n", tp->dev->name);
@@ -13645,7 +13645,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
13645 "%s: attached PHY driver [%s] (mii_bus:phy_addr=%s)\n", 13645 "%s: attached PHY driver [%s] (mii_bus:phy_addr=%s)\n",
13646 tp->dev->name, 13646 tp->dev->name,
13647 tp->mdio_bus->phy_map[PHY_ADDR]->drv->name, 13647 tp->mdio_bus->phy_map[PHY_ADDR]->drv->name,
13648 tp->mdio_bus->phy_map[PHY_ADDR]->dev.bus_id); 13648 dev_name(&tp->mdio_bus->phy_map[PHY_ADDR]->dev));
13649 else 13649 else
13650 printk(KERN_INFO 13650 printk(KERN_INFO
13651 "%s: attached PHY is %s (%s Ethernet) (WireSpeed[%d])\n", 13651 "%s: attached PHY is %s (%s Ethernet) (WireSpeed[%d])\n",