net: struct device - replace bus_id with dev_name(), dev_set_name()

Acked-by: Marcel Holtmann <marcel@holtmann.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 546b9eeaa17..e05849ee900 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -1396,7 +1396,7 @@ static int tg3_phy_init(struct tg3 *tp)
         phydev = tp->mdio_bus->phy_map[PHY_ADDR];
 
         /* Attach the MAC to the PHY. */
-        phydev = phy_connect(tp->dev, phydev->dev.bus_id, tg3_adjust_link,
+        phydev = phy_connect(tp->dev, dev_name(&phydev->dev), tg3_adjust_link,
                              phydev->dev_flags, phydev->interface);
         if (IS_ERR(phydev)) {
                 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,
                        "%s: attached PHY driver [%s] (mii_bus:phy_addr=%s)\n",
                        tp->dev->name,
                        tp->mdio_bus->phy_map[PHY_ADDR]->drv->name,
-                       tp->mdio_bus->phy_map[PHY_ADDR]->dev.bus_id);
+                       dev_name(&tp->mdio_bus->phy_map[PHY_ADDR]->dev));
         else
                 printk(KERN_INFO
                        "%s: attached PHY is %s (%s Ethernet) (WireSpeed[%d])\n",