22 files changed, 34 insertions, 34 deletions

diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
index 0443654f0339..90b540a4a561 100644
--- a/drivers/net/ethernet/8390/ax88796.c
+++ b/drivers/net/ethernet/8390/ax88796.c
@@ -372,7 +372,7 @@ static int ax_mii_probe(struct net_device *dev)
         ax->phy_dev = phy_dev;
 
         netdev_info(dev, "PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",
-                    phy_dev->drv->name, dev_name(&phy_dev->dev), phy_dev->irq);
+                    phy_dev->drv->name, phydev_name(phy_dev), phy_dev->irq);
 
         return 0;
 }
diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
index e0e95a15cab0..5f8a5182b8dc 100644
--- a/drivers/net/ethernet/adi/bfin_mac.c
+++ b/drivers/net/ethernet/adi/bfin_mac.c
@@ -419,7 +419,7 @@ static int mii_probe(struct net_device *dev, int phy_mode)
                 return -EINVAL;
         }
 
-        phydev = phy_connect(dev, dev_name(&phydev->dev),
+        phydev = phy_connect(dev, phydev_name(phydev),
                              &bfin_mac_adjust_link, phy_mode);
 
         if (IS_ERR(phydev)) {
@@ -446,7 +446,7 @@ static int mii_probe(struct net_device *dev, int phy_mode)
 
         pr_info("attached PHY driver [%s] "
                 "(mii_bus:phy_addr=%s, irq=%d, mdc_clk=%dHz(mdc_div=%d)@sclk=%dMHz)\n",
-                phydev->drv->name, dev_name(&phydev->dev), phydev->irq,
+                phydev->drv->name, phydev_name(phydev), phydev->irq,
                 MDC_CLK, mdc_div, sclk/1000000);
 
         return 0;
diff --git a/drivers/net/ethernet/agere/et131x.c b/drivers/net/ethernet/agere/et131x.c
index e0f3d197e7f2..80b706f0fc97 100644
--- a/drivers/net/ethernet/agere/et131x.c
+++ b/drivers/net/ethernet/agere/et131x.c
@@ -3265,7 +3265,7 @@ static int et131x_mii_probe(struct net_device *netdev)
                 return -ENODEV;
         }
 
-        phydev = phy_connect(netdev, dev_name(&phydev->dev),
+        phydev = phy_connect(netdev, phydev_name(phydev),
                              &et131x_adjust_link, PHY_INTERFACE_MODE_MII);
 
         if (IS_ERR(phydev)) {
@@ -3291,7 +3291,7 @@ static int et131x_mii_probe(struct net_device *netdev)
 
         dev_info(&adapter->pdev->dev,
                  "attached PHY driver [%s] (mii_bus:phy_addr=%s)\n",
-                 phydev->drv->name, dev_name(&phydev->dev));
+                 phydev->drv->name, phydev_name(phydev));
 
         return 0;
 }
diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c
index 5330bcb8a944..8a8d6f2a0f6f 100644
--- a/drivers/net/ethernet/amd/au1000_eth.c
+++ b/drivers/net/ethernet/amd/au1000_eth.c
@@ -558,7 +558,7 @@ static int au1000_mii_probe(struct net_device *dev)
         /* now we are supposed to have a proper phydev, to attach to... */
         BUG_ON(phydev->attached_dev);
 
-        phydev = phy_connect(dev, dev_name(&phydev->dev),
+        phydev = phy_connect(dev, phydev_name(phydev),
                              &au1000_adjust_link, PHY_INTERFACE_MODE_MII);
 
         if (IS_ERR(phydev)) {
@@ -585,7 +585,7 @@ static int au1000_mii_probe(struct net_device *dev)
 
         netdev_info(dev, "attached PHY driver [%s] "
                "(mii_bus:phy_addr=%s, irq=%d)\n",
-               phydev->drv->name, dev_name(&phydev->dev), phydev->irq);
+               phydev->drv->name, phydev_name(phydev), phydev->irq);
 
         return 0;
 }
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
index a3b1c07ae0af..928a2210e788 100644
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
@@ -2316,7 +2316,7 @@ static int b44_register_phy_one(struct b44 *bp)
         bp->phy_addr = phydev->addr;
 
         dev_info(sdev->dev, "attached PHY driver [%s] (mii_bus:phy_addr=%s)\n",
-                 phydev->drv->name, dev_name(&phydev->dev));
+                 phydev->drv->name, phydev_name(phydev));
 
         return 0;
 
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 79789d8e52da..69d84d67f09a 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -2096,7 +2096,7 @@ static int tg3_phy_init(struct tg3 *tp)
         phydev = tp->mdio_bus->phy_map[tp->phy_addr];
 
         /* Attach the MAC to the PHY. */
-        phydev = phy_connect(tp->dev, dev_name(&phydev->dev),
+        phydev = phy_connect(tp->dev, phydev_name(phydev),
                              tg3_adjust_link, phydev->interface);
         if (IS_ERR(phydev)) {
                 dev_err(&tp->pdev->dev, "Could not attach to PHY\n");
@@ -17903,7 +17903,7 @@ static int tg3_init_one(struct pci_dev *pdev,
                 phydev = tp->mdio_bus->phy_map[tp->phy_addr];
                 netdev_info(dev,
                             "attached PHY driver [%s] (mii_bus:phy_addr=%s)\n",
-                            phydev->drv->name, dev_name(&phydev->dev));
+                            phydev->drv->name, phydev_name(phydev));
         } else {
                 char *ethtype;
 
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 8b45bc9ac29e..001d60c5521c 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -2951,7 +2951,7 @@ static int macb_probe(struct platform_device *pdev)
 
         phydev = bp->phy_dev;
         netdev_info(dev, "attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",
-                    phydev->drv->name, dev_name(&phydev->dev), phydev->irq);
+                    phydev->drv->name, phydev_name(phydev), phydev->irq);
 
         return 0;
 
diff --git a/drivers/net/ethernet/dnet.c b/drivers/net/ethernet/dnet.c
index 13d00a38a5bd..136b6010f704 100644
--- a/drivers/net/ethernet/dnet.c
+++ b/drivers/net/ethernet/dnet.c
@@ -274,11 +274,11 @@ static int dnet_mii_probe(struct net_device *dev)
 
         /* attach the mac to the phy */
         if (bp->capabilities & DNET_HAS_RMII) {
-                phydev = phy_connect(dev, dev_name(&phydev->dev),
+                phydev = phy_connect(dev, phydev_name(phydev),
                                      &dnet_handle_link_change,
                                      PHY_INTERFACE_MODE_RMII);
         } else {
-                phydev = phy_connect(dev, dev_name(&phydev->dev),
+                phydev = phy_connect(dev, phydev_name(phydev),
                                      &dnet_handle_link_change,
                                      PHY_INTERFACE_MODE_MII);
         }
@@ -894,7 +894,7 @@ static int dnet_probe(struct platform_device *pdev)
         phydev = bp->phy_dev;
         dev_info(&pdev->dev, "attached PHY driver [%s] "
                "(mii_bus:phy_addr=%s, irq=%d)\n",
-               phydev->drv->name, dev_name(&phydev->dev), phydev->irq);
+               phydev->drv->name, phydev_name(phydev), phydev->irq);
 
         return 0;
 
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 6d0c5d5eea6d..c2e2ac6a0313 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -854,7 +854,7 @@ static int ftgmac100_mii_probe(struct ftgmac100 *priv)
                 return -ENODEV;
         }
 
-        phydev = phy_connect(netdev, dev_name(&phydev->dev),
+        phydev = phy_connect(netdev, phydev_name(phydev),
                              &ftgmac100_adjust_link, PHY_INTERFACE_MODE_GMII);
 
         if (IS_ERR(phydev)) {
diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
index 581928c068f2..274a3cec84c2 100644
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c
@@ -390,7 +390,7 @@ ltq_etop_mdio_probe(struct net_device *dev)
                 return -ENODEV;
         }
 
-        phydev = phy_connect(dev, dev_name(&phydev->dev),
+        phydev = phy_connect(dev, phydev_name(phydev),
                              &ltq_etop_mdio_link, priv->pldata->mii_mode);
 
         if (IS_ERR(phydev)) {
@@ -410,7 +410,7 @@ ltq_etop_mdio_probe(struct net_device *dev)
         priv->phydev = phydev;
         pr_info("%s: attached PHY [%s] (phy_addr=%s, irq=%d)\n",
                dev->name, phydev->drv->name,
-               dev_name(&phydev->dev), phydev->irq);
+               phydev_name(phydev), phydev->irq);
 
         return 0;
 }
diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c
index 057665180f13..5801aa197697 100644
--- a/drivers/net/ethernet/nxp/lpc_eth.c
+++ b/drivers/net/ethernet/nxp/lpc_eth.c
@@ -797,7 +797,7 @@ static int lpc_mii_probe(struct net_device *ndev)
                 netdev_info(ndev, "using MII interface\n");
         else
                 netdev_info(ndev, "using RMII interface\n");
-        phydev = phy_connect(ndev, dev_name(&phydev->dev),
+        phydev = phy_connect(ndev, phydev_name(phydev),
                              &lpc_handle_link_change,
                              lpc_phy_interface_mode(&pldat->pdev->dev));
 
@@ -818,7 +818,7 @@ static int lpc_mii_probe(struct net_device *ndev)
 
         netdev_info(ndev,
                 "attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",
-                phydev->drv->name, dev_name(&phydev->dev), phydev->irq);
+                phydev->drv->name, phydev_name(phydev), phydev->irq);
         return 0;
 }
 
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c
index 9a37247cf4b8..86a0887811c7 100644
--- a/drivers/net/ethernet/rdc/r6040.c
+++ b/drivers/net/ethernet/rdc/r6040.c
@@ -1039,7 +1039,7 @@ static int r6040_mii_probe(struct net_device *dev)
                 return -ENODEV;
         }
 
-        phydev = phy_connect(dev, dev_name(&phydev->dev), &r6040_adjust_link,
+        phydev = phy_connect(dev, phydev_name(phydev), &r6040_adjust_link,
                              PHY_INTERFACE_MODE_MII);
 
         if (IS_ERR(phydev)) {
@@ -1063,7 +1063,7 @@ static int r6040_mii_probe(struct net_device *dev)
 
         dev_info(&lp->pdev->dev, "attached PHY driver [%s] "
                 "(mii_bus:phy_addr=%s)\n",
-                phydev->drv->name, dev_name(&phydev->dev));
+                phydev->drv->name, phydev_name(phydev));
 
         return 0;
 }
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 0e1ebb39ab46..2f6c974e4a6d 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -928,7 +928,7 @@ static int ravb_phy_init(struct net_device *ndev)
         phydev->supported &= ~PHY_10BT_FEATURES;
 
         netdev_info(ndev, "attached PHY %d (IRQ %d) to driver %s\n",
-                    phydev->addr, phydev->irq, phydev->drv->name);
+                    phydev->addr, phydev->irq, phydev_name(phydev));
 
         priv->phydev = phydev;
 
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index baa81535a8fc..e14d28474b70 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1827,7 +1827,7 @@ static int sh_eth_phy_init(struct net_device *ndev)
         }
 
         netdev_info(ndev, "attached PHY %d (IRQ %d) to driver %s\n",
-                    phydev->addr, phydev->irq, phydev->drv->name);
+                    phydev->addr, phydev->irq, phydev_name(phydev));
 
         mdp->phydev = phydev;
 
diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_mdio.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_mdio.c
index 43ccb4a6de15..5b13b8c11bef 100644
--- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_mdio.c
+++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_mdio.c
@@ -216,7 +216,7 @@ int sxgbe_mdio_register(struct net_device *ndev)
                         }
                         netdev_info(ndev, "PHY ID %08x at %d IRQ %s (%s)%s\n",
                                     phy->phy_id, phy_addr, irq_str,
-                                    dev_name(&phy->dev), act ? " active" : "");
+                                    phydev_name(phy), act ? " active" : "");
                         phy_found = true;
                 }
         }
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index 219a99b7a631..067346d3209d 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -1033,7 +1033,7 @@ static int smsc911x_mii_probe(struct net_device *dev)
 
         netdev_info(dev,
                     "attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",
-                    phydev->drv->name, dev_name(&phydev->dev), phydev->irq);
+                    phydev->drv->name, phydev_name(phydev), phydev->irq);
 
         /* mask with MAC supported features */
         phydev->supported &= (PHY_BASIC_FEATURES | SUPPORTED_Pause |
diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c
index 4a90cdae5444..a02ed6b63064 100644
--- a/drivers/net/ethernet/smsc/smsc9420.c
+++ b/drivers/net/ethernet/smsc/smsc9420.c
@@ -1167,7 +1167,7 @@ static int smsc9420_mii_probe(struct net_device *dev)
         netif_info(pd, probe, pd->dev, "PHY addr %d, phy_id 0x%08X\n",
                    phydev->addr, phydev->phy_id);
 
-        phydev = phy_connect(dev, dev_name(&phydev->dev),
+        phydev = phy_connect(dev, phydev_name(phydev),
                              smsc9420_phy_adjust_link, PHY_INTERFACE_MODE_MII);
 
         if (IS_ERR(phydev)) {
@@ -1176,7 +1176,7 @@ static int smsc9420_mii_probe(struct net_device *dev)
         }
 
         netdev_info(dev, "attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",
-                    phydev->drv->name, dev_name(&phydev->dev), phydev->irq);
+                    phydev->drv->name, phydev_name(phydev), phydev->irq);
 
         /* mask with MAC supported features */
         phydev->supported &= (PHY_BASIC_FEATURES | SUPPORTED_Pause |
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index 16c85ccd1762..05ba84118f37 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -298,7 +298,7 @@ int stmmac_mdio_register(struct net_device *ndev)
                         }
                         pr_info("%s: PHY ID %08x at %d IRQ %s (%s)%s\n",
                                 ndev->name, phydev->phy_id, addr,
-                                irq_str, dev_name(&phydev->dev),
+                                irq_str, phydev_name(phydev),
                                 act ? " active" : "");
                         found = 1;
                 }
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 33bd3b902304..5a40b0256327 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -1646,7 +1646,7 @@ static int emac_dev_open(struct net_device *ndev)
 
                 dev_info(emac_dev, "attached PHY driver [%s] "
                         "(mii_bus:phy_addr=%s, id=%x)\n",
-                        priv->phydev->drv->name, dev_name(&priv->phydev->dev),
+                        priv->phydev->drv->name, phydev_name(priv->phydev),
                         priv->phydev->phy_id);
         }
 
diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c
index c00084d689f3..88e8e6055b9f 100644
--- a/drivers/net/ethernet/ti/davinci_mdio.c
+++ b/drivers/net/ethernet/ti/davinci_mdio.c
@@ -396,7 +396,7 @@ static int davinci_mdio_probe(struct platform_device *pdev)
                 phy = data->bus->phy_map[addr];
                 if (phy) {
                         dev_info(dev, "phy[%d]: device %s, driver %s\n",
-                                 phy->addr, dev_name(&phy->dev),
+                                 phy->addr, phydev_name(phy),
                                  phy->drv ? phy->drv->name : "unknown");
                 }
         }
diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c
index 4e70e7586a09..d543298d6750 100644
--- a/drivers/net/ethernet/ti/netcp_ethss.c
+++ b/drivers/net/ethernet/ti/netcp_ethss.c
@@ -2178,7 +2178,7 @@ static int gbe_slave_open(struct gbe_intf *gbe_intf)
                         return -ENODEV;
                 }
                 dev_dbg(priv->dev, "phy found: id is: 0x%s\n",
-                        dev_name(&slave->phy->dev));
+                        phydev_name(slave->phy));
                 phy_start(slave->phy);
                 phy_read_status(slave->phy);
         }
@@ -2681,7 +2681,7 @@ static void init_secondary_ports(struct gbe_priv *gbe_dev,
                         slave->phy = NULL;
                 } else {
                         dev_dbg(dev, "phy found: id is: 0x%s\n",
-                                dev_name(&slave->phy->dev));
+                                phydev_name(slave->phy));
                         phy_start(slave->phy);
                         phy_read_status(slave->phy);
                 }
diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c
index 45ac38d29ed8..8df6072ac78d 100644
--- a/drivers/net/ethernet/toshiba/tc35815.c
+++ b/drivers/net/ethernet/toshiba/tc35815.c
@@ -631,7 +631,7 @@ static int tc_mii_probe(struct net_device *dev)
         }
 
         /* attach the mac to the phy */
-        phydev = phy_connect(dev, dev_name(&phydev->dev),
+        phydev = phy_connect(dev, phydev_name(phydev),
                              &tc_handle_link_change,
                              lp->chiptype == TC35815_TX4939 ? PHY_INTERFACE_MODE_RMII : PHY_INTERFACE_MODE_MII);
         if (IS_ERR(phydev)) {
@@ -640,7 +640,7 @@ static int tc_mii_probe(struct net_device *dev)
         }
         printk(KERN_INFO "%s: attached PHY driver [%s] "
                 "(mii_bus:phy_addr=%s, id=%x)\n",
-                dev->name, phydev->drv->name, dev_name(&phydev->dev),
+                dev->name, phydev->drv->name, phydev_name(phydev),
                 phydev->phy_id);
 
         /* mask with MAC supported features */