Skip to content

Commit

Permalink
phy: add phydev_name() wrapper
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Andrew Lunn authored and David S. Miller committed Jan 7, 2016
1 parent 72ba48b commit 84eff6d
Show file tree
Hide file tree
Showing 26 changed files with 44 additions and 39 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/8390/ax88796.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/adi/bfin_mac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/agere/et131x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/amd/au1000_eth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/broadcom/b44.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/broadcom/tg3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/cadence/macb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions drivers/net/ethernet/dnet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/faraday/ftgmac100.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/lantiq_etop.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/nxp/lpc_eth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand All @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/rdc/r6040.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/renesas/ravb_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/renesas/sh_eth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/samsung/sxgbe/sxgbe_mdio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/smsc/smsc911x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/smsc/smsc9420.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/ti/davinci_emac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/ti/davinci_mdio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/ti/netcp_ethss.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/toshiba/tc35815.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/phy/bcm7xxx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ static int bcm7xxx_28nm_config_init(struct phy_device *phydev)
int ret = 0;

pr_info_once("%s: %s PHY revision: 0x%02x, patch: %d\n",
dev_name(&phydev->dev), phydev->drv->name, rev, patch);
phydev_name(phydev), phydev->drv->name, rev, patch);

/* Dummy read to a register to workaround an issue upon reset where the
* internal inverter may not allow the first MDIO transaction to pass
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/phy/phy_device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ EXPORT_SYMBOL(phy_register_fixup_for_id);
*/
static int phy_needs_fixup(struct phy_device *phydev, struct phy_fixup *fixup)
{
if (strcmp(fixup->bus_id, dev_name(&phydev->dev)) != 0)
if (strcmp(fixup->bus_id, phydev_name(phydev)) != 0)
if (strcmp(fixup->bus_id, PHY_ANY_ID) != 0)
return 0;

Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/netlogic/xlr_net.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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;
}

Expand Down
5 changes: 5 additions & 0 deletions include/linux/phy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,11 @@ static inline int phy_read_status(struct phy_device *phydev)
#define phydev_dbg(_phydev, format, args...) \
dev_dbg(&_phydev->dev, format, ##args)

static inline const char *phydev_name(const struct phy_device *phydev)
{
return dev_name(&phydev->dev);
}

int genphy_config_init(struct phy_device *phydev);
int genphy_setup_forced(struct phy_device *phydev);
int genphy_restart_aneg(struct phy_device *phydev);
Expand Down

0 comments on commit 84eff6d

Please sign in to comment.