summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2016-01-06 20:11:10 +0100
committerDavid S. Miller <davem@davemloft.net>2016-01-07 14:31:25 -0500
commit84eff6d194df442bee62c129f2f47efb0dbd0468 (patch)
treedc3c76b19f8e2171416f2f3b42d6bdcbc6da927f /drivers/staging
parent72ba48be3ec8e70937ad97d4420ef7144617c64b (diff)
downloadblackbird-op-linux-84eff6d194df442bee62c129f2f47efb0dbd0468.tar.gz
blackbird-op-linux-84eff6d194df442bee62c129f2f47efb0dbd0468.zip
phy: add phydev_name() wrapper
Add a phydev_name() function, to help with moving some structure members from phy_device. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/netlogic/xlr_net.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/netlogic/xlr_net.c b/drivers/staging/netlogic/xlr_net.c
index 8ae01753b011..b939c4b5f229 100644
--- a/drivers/staging/netlogic/xlr_net.c
+++ b/drivers/staging/netlogic/xlr_net.c
@@ -838,8 +838,8 @@ static int xlr_mii_probe(struct xlr_net_priv *priv)
}
/* Attach MAC to PHY */
- phydev = phy_connect(priv->ndev, dev_name(&phydev->dev),
- &xlr_gmac_link_adjust, priv->nd->phy_interface);
+ phydev = phy_connect(priv->ndev, phydev_name(phydev),
+ &xlr_gmac_link_adjust, priv->nd->phy_interface);
if (IS_ERR(phydev)) {
pr_err("could not attach PHY\n");
@@ -855,7 +855,7 @@ static int xlr_mii_probe(struct xlr_net_priv *priv)
phydev->advertising = phydev->supported;
pr_info("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;
}
OpenPOWER on IntegriCloud