Commit da099a7f authored by Andrew Lunn's avatar Andrew Lunn Committed by Paolo Abeni
Browse files

net: phy: Remove probe_capabilities 



Deciding if to probe of PHYs using C45 is now determine by if the bus
provides the C45 read method. This makes probe_capabilities redundant
so remove it.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Reviewed-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Acked-by: default avatarAndrew Jeffery <andrew@aj.id.au>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent fbfe9759

drivers/net/ethernet/adi/adin1110.c

+0 −1
Original line number Diff line number Diff line
@@ -523,7 +523,6 @@ static int adin1110_register_mdiobus(struct adin1110_priv *priv, 
	mii_bus->priv = priv;

	mii_bus->parent = dev;

	mii_bus->phy_mask = ~((u32)GENMASK(2, 0));

	mii_bus->probe_capabilities = MDIOBUS_C22;

	snprintf(mii_bus->id, MII_BUS_ID_SIZE, "%s", dev_name(dev));



	ret = devm_mdiobus_register(dev, mii_bus);

drivers/net/ethernet/freescale/xgmac_mdio.c

+0 −1
Original line number Diff line number Diff line
@@ -397,7 +397,6 @@ static int xgmac_mdio_probe(struct platform_device *pdev) 
	bus->read_c45 = xgmac_mdio_read_c45;

	bus->write_c45 = xgmac_mdio_write_c45;

	bus->parent = &pdev->dev;

	bus->probe_capabilities = MDIOBUS_C22_C45;

	snprintf(bus->id, MII_BUS_ID_SIZE, "%pa", &res->start);



	priv = bus->priv;

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+0 −1
Original line number Diff line number Diff line
@@ -814,7 +814,6 @@ static int mtk_mdio_init(struct mtk_eth *eth) 
	eth->mii_bus->write = mtk_mdio_write_c22;

	eth->mii_bus->read_c45 = mtk_mdio_read_c45;

	eth->mii_bus->write_c45 = mtk_mdio_write_c45;

	eth->mii_bus->probe_capabilities = MDIOBUS_C22_C45;

	eth->mii_bus->priv = eth;

	eth->mii_bus->parent = eth->dev;

drivers/net/ethernet/microchip/lan743x_main.c

+0 −2
Original line number Diff line number Diff line
@@ -3302,7 +3302,6 @@ static int lan743x_mdiobus_init(struct lan743x_adapter *adapter) 
			lan743x_csr_write(adapter, SGMII_CTL, sgmii_ctl);

			netif_dbg(adapter, drv, adapter->netdev,

				  "SGMII operation\n");

			adapter->mdiobus->probe_capabilities = MDIOBUS_C22_C45;

			adapter->mdiobus->read = lan743x_mdiobus_read_c22;

			adapter->mdiobus->write = lan743x_mdiobus_write_c22;

			adapter->mdiobus->read_c45 = lan743x_mdiobus_read_c45;
@@ -3318,7 +3317,6 @@ static int lan743x_mdiobus_init(struct lan743x_adapter *adapter) 
			netif_dbg(adapter, drv, adapter->netdev,

				  "RGMII operation\n");

			// Only C22 support when RGMII I/F

			adapter->mdiobus->probe_capabilities = MDIOBUS_C22;

			adapter->mdiobus->read = lan743x_mdiobus_read_c22;

			adapter->mdiobus->write = lan743x_mdiobus_write_c22;

			adapter->mdiobus->name = "lan743x-mdiobus";

drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c

+0 −3
Original line number Diff line number Diff line
@@ -553,9 +553,6 @@ int stmmac_mdio_register(struct net_device *ndev) 


	new_bus->name = "stmmac";



	if (priv->plat->has_gmac4)

		new_bus->probe_capabilities = MDIOBUS_C22_C45;



	if (priv->plat->has_xgmac) {

		new_bus->read = &stmmac_xgmac2_mdio_read_c22;

		new_bus->write = &stmmac_xgmac2_mdio_write_c22;