apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

phy: Centralise print about attached phy

Browse Source 
Many Ethernet drivers contain the same netdev_info() print statement
about the attached phy. Move it into the phy device code. Additionally
add a varargs function which can be used to append additional
information.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andrew Lunn
2016-01-06 20:11:13 +01:00
committed by David S. Miller
parent 053e7e1692
commit 2220943a21
25 changed files with 64 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/ethernet/adi/bfin_mac.c
+2 -4
View File
@@ -444,10 +444,8 @@ static int mii_probe(struct net_device *dev, int phy_mode)
lp->old_duplex = -1;
lp->phydev = phydev;
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, phydev_name(phydev), phydev->irq,
MDC_CLK, mdc_div, sclk/1000000);
phy_attached_print(phydev, "mdc_clk=%dHz(mdc_div=%d)@sclk=%dMHz)\n",
MDC_CLK, mdc_div, sclk / 1000000);
return 0;
}
drivers/net/ethernet/agere/et131x.c
+1 -3
View File
@@ -3289,9 +3289,7 @@ static int et131x_mii_probe(struct net_device *netdev)
phydev->autoneg = AUTONEG_ENABLE;
adapter->phydev = phydev;
dev_info(&adapter->pdev->dev,
"attached PHY driver [%s] (mii_bus:phy_addr=%s)\n",
phydev->drv->name, phydev_name(phydev));
phy_attached_info(phydev);
return 0;
}
drivers/net/ethernet/amd/au1000_eth.c
+1 -3
View File
@@ -583,9 +583,7 @@ static int au1000_mii_probe(struct net_device *dev)
aup->old_duplex = -1;
aup->phy_dev = phydev;
netdev_info(dev, "attached PHY driver [%s] "
"(mii_bus:phy_addr=%s, irq=%d)\n",
phydev->drv->name, phydev_name(phydev), phydev->irq);
phy_attached_info(phydev);
return 0;
}
drivers/net/ethernet/broadcom/b44.c
+1 -2
View File
@@ -2315,8 +2315,7 @@ static int b44_register_phy_one(struct b44 *bp)
bp->old_link = 0;
bp->phy_addr = phydev->addr;
dev_info(sdev->dev, "attached PHY driver [%s] (mii_bus:phy_addr=%s)\n",
phydev->drv->name, phydev_name(phydev));
phy_attached_info(phydev);
return 0;
drivers/net/ethernet/broadcom/bcm63xx_enet.c
+1 -2
View File
@@ -908,8 +908,7 @@ static int bcm_enet_open(struct net_device *dev)
else
phydev->advertising &= ~SUPPORTED_Pause;
dev_info(kdev, "attached PHY at address %d [%s]\n",
phydev->addr, phydev->drv->name);
phy_attached_info(phydev);
priv->old_link = 0;
priv->old_duplex = -1;
drivers/net/ethernet/broadcom/sb1250-mac.c
+3 -4
View File
@@ -2388,11 +2388,10 @@ static int sbmac_mii_probe(struct net_device *dev)
SUPPORTED_MII |
SUPPORTED_Pause |
SUPPORTED_Asym_Pause;
phy_dev->advertising = phy_dev->supported;
pr_info("%s: attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",
dev->name, phy_dev->drv->name,
dev_name(&phy_dev->dev), phy_dev->irq);
phy_attached_info(phydev);
phy_dev->advertising = phy_dev->supported;
sc->phy_dev = phy_dev;
drivers/net/ethernet/broadcom/tg3.c
+3 -7
View File
@@ -2128,6 +2128,8 @@ static int tg3_phy_init(struct tg3 *tp)
phydev->advertising = phydev->supported;
phy_attached_info(phydev);
return 0;
}
@@ -17898,13 +17900,7 @@ static int tg3_init_one(struct pci_dev *pdev,
tg3_bus_string(tp, str),
dev->dev_addr);
if (tp->phy_flags & TG3_PHYFLG_IS_CONNECTED) {
struct phy_device *phydev;
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, phydev_name(phydev));
} else {
if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED)) {
char *ethtype;
if (tp->phy_flags & TG3_PHYFLG_10_100_ONLY)
drivers/net/ethernet/cadence/macb.c
+1 -2
View File
@@ -2950,8 +2950,7 @@ static int macb_probe(struct platform_device *pdev)
dev->base_addr, dev->irq, dev->dev_addr);
phydev = bp->phy_dev;
netdev_info(dev, "attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",
phydev->drv->name, phydev_name(phydev), phydev->irq);
phy_attached_info(phydev);
return 0;
drivers/net/ethernet/dnet.c
+1 -3
View File
@@ -886,9 +886,7 @@ static int dnet_probe(struct platform_device *pdev)
(bp->capabilities & DNET_HAS_GIGABIT) ? "" : "no ",
(bp->capabilities & DNET_HAS_DMA) ? "" : "no ");
phydev = bp->phy_dev;
dev_info(&pdev->dev, "attached PHY driver [%s] "
"(mii_bus:phy_addr=%s, irq=%d)\n",
phydev->drv->name, phydev_name(phydev), phydev->irq);
phy_attached_info(phydev);
return 0;
drivers/net/ethernet/freescale/fec_main.c
+1 -3
View File
@@ -1972,9 +1972,7 @@ static int fec_enet_mii_probe(struct net_device *ndev)
fep->link = 0;
fep->full_duplex = 0;
netdev_info(ndev, "Freescale FEC PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",
fep->phy_dev->drv->name, dev_name(&fep->phy_dev->dev),
fep->phy_dev->irq);
phy_attached_info(phy_dev);
return 0;
}
drivers/net/ethernet/lantiq_etop.c
+1 -3
View File
@@ -408,9 +408,7 @@ ltq_etop_mdio_probe(struct net_device *dev)
phydev->advertising = phydev->supported;
priv->phydev = phydev;
pr_info("%s: attached PHY [%s] (phy_addr=%s, irq=%d)\n",
dev->name, phydev->drv->name,
phydev_name(phydev), phydev->irq);
phy_attached_info(phydev);
return 0;
}
drivers/net/ethernet/nxp/lpc_eth.c
+2 -3
View File
@@ -816,9 +816,8 @@ static int lpc_mii_probe(struct net_device *ndev)
pldat->duplex = -1;
pldat->phy_dev = phydev;
netdev_info(ndev,
"attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",
phydev->drv->name, phydev_name(phydev), phydev->irq);
phy_attached_info(phydev);
return 0;
}
drivers/net/ethernet/rdc/r6040.c
+1 -3
View File
@@ -1061,9 +1061,7 @@ static int r6040_mii_probe(struct net_device *dev)
lp->old_link = 0;
lp->old_duplex = -1;
dev_info(&lp->pdev->dev, "attached PHY driver [%s] "
"(mii_bus:phy_addr=%s)\n",
phydev->drv->name, phydev_name(phydev));
phy_attached_info(phydev);
return 0;
}
drivers/net/ethernet/renesas/ravb_main.c
+1 -2
View File
@@ -927,8 +927,7 @@ static int ravb_phy_init(struct net_device *ndev)
/* 10BASE is not supported */
phydev->supported &= ~PHY_10BT_FEATURES;
netdev_info(ndev, "attached PHY %d (IRQ %d) to driver %s\n",
phydev->addr, phydev->irq, phydev_name(phydev));
phy_attached_info(phydev);
priv->phydev = phydev;
drivers/net/ethernet/renesas/sh_eth.c
+1 -2
View File
@@ -1826,8 +1826,7 @@ static int sh_eth_phy_init(struct net_device *ndev)
return PTR_ERR(phydev);
}
netdev_info(ndev, "attached PHY %d (IRQ %d) to driver %s\n",
phydev->addr, phydev->irq, phydev_name(phydev));
phy_attached_info(phydev);
mdp->phydev = phydev;
drivers/net/ethernet/smsc/smsc911x.c
+1 -3
View File
@@ -1031,9 +1031,7 @@ static int smsc911x_mii_probe(struct net_device *dev)
return ret;
}
netdev_info(dev,
"attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",
phydev->drv->name, phydev_name(phydev), phydev->irq);
phy_attached_info(phydev);
/* mask with MAC supported features */
phydev->supported &= (PHY_BASIC_FEATURES | SUPPORTED_Pause |
drivers/net/ethernet/smsc/smsc9420.c
+2 -7
View File
@@ -1163,10 +1163,6 @@ static int smsc9420_mii_probe(struct net_device *dev)
return -ENODEV;
}
phydev = pd->mii_bus->phy_map[1];
netif_info(pd, probe, pd->dev, "PHY addr %d, phy_id 0x%08X\n",
phydev->addr, phydev->phy_id);
phydev = phy_connect(dev, phydev_name(phydev),
smsc9420_phy_adjust_link, PHY_INTERFACE_MODE_MII);
@@ -1175,14 +1171,13 @@ static int smsc9420_mii_probe(struct net_device *dev)
return PTR_ERR(phydev);
}
netdev_info(dev, "attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",
phydev->drv->name, phydev_name(phydev), phydev->irq);
/* mask with MAC supported features */
phydev->supported &= (PHY_BASIC_FEATURES | SUPPORTED_Pause |
SUPPORTED_Asym_Pause);
phydev->advertising = phydev->supported;
phy_attached_info(phydev);
pd->phy_dev = phydev;
pd->last_duplex = -1;
pd->last_carrier = -1;
drivers/net/ethernet/synopsys/dwc_eth_qos.c
+1 -11
View File
@@ -972,9 +972,7 @@ static int dwceqos_mii_probe(struct net_device *ndev)
}
if (netif_msg_probe(lp))
netdev_dbg(lp->ndev,
"phydev %p, phydev->phy_id 0xa%x, phydev->addr 0x%x\n",
phydev, phydev->phy_id, phydev->addr);
phy_attached_info(phydev);
phydev->supported &= PHY_GBIT_FEATURES;
@@ -983,14 +981,6 @@ static int dwceqos_mii_probe(struct net_device *ndev)
lp->duplex = DUPLEX_UNKNOWN;
lp->phy_dev = phydev;
if (netif_msg_probe(lp)) {
netdev_dbg(lp->ndev, "phy_addr 0x%x, phy_id 0x%08x\n",
lp->phy_dev->addr, lp->phy_dev->phy_id);
netdev_dbg(lp->ndev, "attach [%s] phy driver\n",
lp->phy_dev->drv->name);
}
return 0;
}
drivers/net/ethernet/ti/cpsw.c
+2 -2
View File
@@ -1159,8 +1159,8 @@ static void cpsw_slave_open(struct cpsw_slave *slave, struct cpsw_priv *priv)
slave->data->phy_id, slave->slave_num);
slave->phy = NULL;
} else {
dev_info(priv->dev, "phy found : id is : 0x%x\n",
slave->phy->phy_id);
phy_attached_info(slave->phy);
phy_start(slave->phy);
/* Configure GMII_SEL register */
drivers/net/ethernet/ti/davinci_emac.c
+1 -4
View File
@@ -1644,10 +1644,7 @@ static int emac_dev_open(struct net_device *ndev)
priv->speed = 0;
priv->duplex = ~0;
dev_info(emac_dev, "attached PHY driver [%s] "
"(mii_bus:phy_addr=%s, id=%x)\n",
priv->phydev->drv->name, phydev_name(priv->phydev),
priv->phydev->phy_id);
phy_attached_info(priv->phydev);
}
if (!priv->phydev) {

Some files were not shown because too many files have changed in this diff Show More