net: remove explicit phylink_generic_validate() references
Subsystems (25)
PATCH 1/1 net: remove explicit phylink_generic_validate() references
Virtually all conventional network drivers are now converted to use phylink_generic_validate() - only DSA drivers and fman_memac remain, so lets remove the necessity for network drivers to explicitly set this member, and default to phylink_generic_validate() when unset. This is possible as .validate must currently be set.
Any remaining instances that have not been addressed by this patch can be fixed up later.
--- drivers/net/ethernet/altera/altera_tse_main.c | 1 - drivers/net/ethernet/atheros/ag71xx.c | 1 - drivers/net/ethernet/cadence/macb_main.c | 1 - drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 1 - drivers/net/ethernet/freescale/enetc/enetc_pf.c | 1 - drivers/net/ethernet/freescale/fman/fman_dtsec.c | 1 - drivers/net/ethernet/freescale/fman/fman_tgec.c | 1 - drivers/net/ethernet/marvell/mvneta.c | 1 - drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 1 - drivers/net/ethernet/marvell/prestera/prestera_main.c | 1 - drivers/net/ethernet/mediatek/mtk_eth_soc.c | 1 - drivers/net/ethernet/microchip/lan966x/lan966x_phylink.c | 1 - drivers/net/ethernet/microchip/sparx5/sparx5_phylink.c | 1 - drivers/net/ethernet/mscc/ocelot_net.c | 1 - drivers/net/ethernet/renesas/rswitch.c | 1 - drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 - drivers/net/ethernet/ti/am65-cpsw-nuss.c | 1 - drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 1 - drivers/net/phy/phylink.c | 5 ++++- drivers/net/usb/asix_devices.c | 1 - include/linux/phylink.h | 5 +++++ 21 files changed, 9 insertions(+), 20 deletions(-)
drivers/net/ethernet/altera/altera_tse_main.c +0 -1
@@ -1095,7 +1095,6 @@ static struct phylink_pcs *alt_tse_select_pcs(struct phylink_config *config, }static const struct phylink_mac_ops alt_tse_phylink_ops = { - .validate = phylink_generic_validate, .mac_an_restart = alt_tse_mac_an_restart, .mac_config = alt_tse_mac_config, .mac_link_down = alt_tse_mac_link_down,
drivers/net/ethernet/atheros/ag71xx.c +0 -1
@@ -1086,7 +1086,6 @@ static void ag71xx_mac_link_up(struct phylink_config *config, }static const struct phylink_mac_ops ag71xx_phylink_mac_ops = { - .validate = phylink_generic_validate, .mac_config = ag71xx_mac_config, .mac_link_down = ag71xx_mac_link_down, .mac_link_up = ag71xx_mac_link_up,
drivers/net/ethernet/cadence/macb_main.c +0 -1
@@ -742,7 +742,6 @@ static struct phylink_pcs *macb_mac_select_pcs(struct phylink_config *config, }static const struct phylink_mac_ops macb_phylink_ops = { - .validate = phylink_generic_validate, .mac_select_pcs = macb_mac_select_pcs, .mac_config = macb_mac_config, .mac_link_down = macb_mac_link_down,
drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c +0 -1
@@ -236,7 +236,6 @@ static void dpaa2_mac_link_down(struct phylink_config *config, }static const struct phylink_mac_ops dpaa2_mac_phylink_ops = { - .validate = phylink_generic_validate, .mac_select_pcs = dpaa2_mac_select_pcs, .mac_config = dpaa2_mac_config, .mac_link_up = dpaa2_mac_link_up,
drivers/net/ethernet/freescale/enetc/enetc_pf.c +0 -1
@@ -1111,7 +1111,6 @@ static void enetc_pl_mac_link_down(struct phylink_config *config, }static const struct phylink_mac_ops enetc_mac_phylink_ops = { - .validate = phylink_generic_validate, .mac_select_pcs = enetc_pl_mac_select_pcs, .mac_config = enetc_pl_mac_config, .mac_link_up = enetc_pl_mac_link_up,
drivers/net/ethernet/freescale/fman/fman_dtsec.c +0 -1
@@ -986,7 +986,6 @@ static void dtsec_link_down(struct phylink_config *config, unsigned int mode, }static const struct phylink_mac_ops dtsec_mac_ops = { - .validate = phylink_generic_validate, .mac_select_pcs = dtsec_select_pcs, .mac_config = dtsec_mac_config, .mac_link_up = dtsec_link_up,
drivers/net/ethernet/freescale/fman/fman_tgec.c +0 -1
@@ -469,7 +469,6 @@ static void tgec_link_down(struct phylink_config *config, unsigned int mode, }static const struct phylink_mac_ops tgec_mac_ops = { - .validate = phylink_generic_validate, .mac_config = tgec_mac_config, .mac_link_up = tgec_link_up, .mac_link_down = tgec_link_down,
drivers/net/ethernet/marvell/mvneta.c +0 -1
@@ -4228,7 +4228,6 @@ static void mvneta_mac_link_up(struct phylink_config *config, }static const struct phylink_mac_ops mvneta_phylink_ops = { - .validate = phylink_generic_validate, .mac_select_pcs = mvneta_mac_select_pcs, .mac_prepare = mvneta_mac_prepare, .mac_config = mvneta_mac_config,
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +0 -1
@@ -6603,7 +6603,6 @@ static void mvpp2_mac_link_down(struct phylink_config *config, }static const struct phylink_mac_ops mvpp2_phylink_ops = { - .validate = phylink_generic_validate, .mac_select_pcs = mvpp2_select_pcs, .mac_prepare = mvpp2_mac_prepare, .mac_config = mvpp2_mac_config,
drivers/net/ethernet/marvell/prestera/prestera_main.c +0 -1
@@ -360,7 +360,6 @@ static void prestera_pcs_an_restart(struct phylink_pcs *pcs) }static const struct phylink_mac_ops prestera_mac_ops = { - .validate = phylink_generic_validate, .mac_select_pcs = prestera_mac_select_pcs, .mac_config = prestera_mac_config, .mac_link_down = prestera_mac_link_down,
drivers/net/ethernet/mediatek/mtk_eth_soc.c +0 -1
@@ -653,7 +653,6 @@ static void mtk_mac_link_up(struct phylink_config *config, }static const struct phylink_mac_ops mtk_phylink_ops = { - .validate = phylink_generic_validate, .mac_select_pcs = mtk_mac_select_pcs, .mac_pcs_get_state = mtk_mac_pcs_get_state, .mac_config = mtk_mac_config,
drivers/net/ethernet/microchip/lan966x/lan966x_phylink.c +0 -1
@@ -124,7 +124,6 @@ static void lan966x_pcs_aneg_restart(struct phylink_pcs *pcs) }const struct phylink_mac_ops lan966x_phylink_mac_ops = { - .validate = phylink_generic_validate, .mac_select_pcs = lan966x_phylink_mac_select, .mac_config = lan966x_phylink_mac_config, .mac_prepare = lan966x_phylink_mac_prepare,
drivers/net/ethernet/microchip/sparx5/sparx5_phylink.c +0 -1
@@ -138,7 +138,6 @@ const struct phylink_pcs_ops sparx5_phylink_pcs_ops = { };const struct phylink_mac_ops sparx5_phylink_mac_ops = { - .validate = phylink_generic_validate, .mac_select_pcs = sparx5_phylink_mac_select_pcs, .mac_config = sparx5_phylink_mac_config, .mac_link_down = sparx5_phylink_mac_link_down,
drivers/net/ethernet/mscc/ocelot_net.c +0 -1
@@ -1727,7 +1727,6 @@ static void vsc7514_phylink_mac_link_up(struct phylink_config *config, }static const struct phylink_mac_ops ocelot_phylink_ops = { - .validate = phylink_generic_validate, .mac_config = vsc7514_phylink_mac_config, .mac_link_down = vsc7514_phylink_mac_link_down, .mac_link_up = vsc7514_phylink_mac_link_up,
drivers/net/ethernet/renesas/rswitch.c +0 -1
@@ -1190,7 +1190,6 @@ static void rswitch_mac_link_up(struct phylink_config *config, }static const struct phylink_mac_ops rswitch_phylink_ops = { - .validate = phylink_generic_validate, .mac_config = rswitch_mac_config, .mac_link_down = rswitch_mac_link_down, .mac_link_up = rswitch_mac_link_up,
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +0 -1
@@ -1080,7 +1080,6 @@ static void stmmac_mac_link_up(struct phylink_config *config, }static const struct phylink_mac_ops stmmac_phylink_mac_ops = { - .validate = phylink_generic_validate, .mac_select_pcs = stmmac_mac_select_pcs, .mac_config = stmmac_mac_config, .mac_link_down = stmmac_mac_link_down,
drivers/net/ethernet/ti/am65-cpsw-nuss.c +0 -1
@@ -1471,7 +1471,6 @@ static void am65_cpsw_nuss_mac_link_up(struct phylink_config *config, struct phy }static const struct phylink_mac_ops am65_cpsw_phylink_mac_ops = { - .validate = phylink_generic_validate, .mac_config = am65_cpsw_nuss_mac_config, .mac_link_down = am65_cpsw_nuss_mac_link_down, .mac_link_up = am65_cpsw_nuss_mac_link_up,
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +0 -1
@@ -1736,7 +1736,6 @@ static void axienet_mac_link_up(struct phylink_config *config, }static const struct phylink_mac_ops axienet_phylink_ops = { - .validate = phylink_generic_validate, .mac_select_pcs = axienet_mac_select_pcs, .mac_config = axienet_mac_config, .mac_link_down = axienet_mac_link_down,
drivers/net/phy/phylink.c +4 -1
@@ -649,7 +649,10 @@ static int phylink_validate_mac_and_pcs(struct phylink *pl, }/* Then validate the link parameters with the MAC */ - pl->mac_ops->validate (pl->config, supported, state); +if (pl->mac_ops->validate) + pl->mac_ops->validate (pl->config, supported, state); +else +phylink_generic_validate (pl->config, supported, state);return phylink_is_empty_linkmode (supported) ? -EINVAL :0 ; }
drivers/net/usb/asix_devices.c +0 -1
@@ -773,7 +773,6 @@ static void ax88772_mac_link_up(struct phylink_config *config, }static const struct phylink_mac_ops ax88772_phylink_mac_ops = { - .validate = phylink_generic_validate, .mac_config = ax88772_mac_config, .mac_link_down = ax88772_mac_link_down, .mac_link_up = ax88772_mac_link_up,
include/linux/phylink.h +5 -0
@@ -207,6 +207,11 @@ struct phylink_mac_ops {* * If the @state->interface mode is not supported, then the @supported * mask must be cleared. +* +* This member is optional; if not set, the generic validator will be +* used making use of @config->mac_capabilities and +* @config->supported_interfaces to determine which link modes are +* supported. */ void validate (struct phylink_config *config,unsigned long *supported,struct phylink_link_state *state);
Signature · 1 line
2.30.2
Quoted 11 lines · Russell King (Oracle)
Virtually all conventional network drivers are now converted to use
phylink_generic_validate()- only DSA drivers andfman_memacremain, so lets remove the necessity for network drivers to explicitly set this member, and default tophylink_generic_validate()when unset. This is possible as .validate must currently be set.Any remaining instances that have not been addressed by this patch can be fixed up later.
Signed-off-by Russell King (Oracle) <[email protected]>---
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Fri, 04 Nov 2022 17:13:01 +0000 you wrote:
Virtually all conventional network drivers are now converted to use
phylink_generic_validate()- only DSA drivers andfman_memacremain, so lets remove the necessity for network drivers to explicitly set this member, and default tophylink_generic_validate()when unset. This is possible as .validate must currently be set.Any remaining instances that have not been addressed by this patch can be fixed up later.
[...]
Here is the summary with links:
- [net-next] net: remove explicit phylink_generic_validate() references
https://git.kernel.org/netdev/net-next/c/e1f4ecab1933
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html