Skip to contentSkip to conversation

net: dsa: adjust_link removal

PATCH Applied Florian Fainelli 3 participants 5 messages Apr 30, 2024 – May 2, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v3 cover net: dsa: adjust_link removal

Now that the last in-tree driver (b53) has been converted to PHYLINK, we can get rid of all of code that catered to working with drivers implementing only PHYLIB's adjust_link callback.

Changes in v3:

- removed additional code in dsa_port_phylink_mac_link_down pertaining to the phy_device reference

Changes in v2:

- remove a now unused phy_device pointer in
dsa_port_phylink_mac_link_down

Florian Fainelli (2):
net: dsa: Remove fixed_link_update member
net: dsa: Remove adjust_link paths

 include/net/dsa.h |  11 ----
 net/dsa/dsa.c     |   3 +-
 net/dsa/port.c    | 139 ++++------------------------------------------
 3 files changed, 12 insertions(+), 141 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH v3 1/2 net: dsa: Remove fixed_link_update member

We have not had a switch driver use a fixed_link_update callback since 58d56fcc3964f9be0a9ca42fd126bcd9dc7afc90 ("net: dsa: bcm_sf2: Get rid of PHYLIB functions") remove this callback.

---
 include/net/dsa.h | 4 ----
 1 file changed, 4 deletions(-)
include/net/dsa.h +0 -4
index a6ef7e4c503f..678f1fd8b189 100644
@@ -25,7 +25,6 @@
 struct dsa_8021q_context;
 struct tc_action;
 struct phy_device;
-struct fixed_phy_status;
 struct phylink_link_state;
 
 #define DSA_TAG_PROTO_NONE_VALUE		0
@@ -873,9 +872,6 @@ struct dsa_switch_ops {
 	 */
 	void	(*adjust_link)(struct dsa_switch *ds, int port,
 				struct phy_device *phydev);
-	void	(*fixed_link_update)(struct dsa_switch *ds, int port,
-				struct fixed_phy_status *st);
-
 	/*
 	 * PHYLINK integration
 	 */
Signature · 1 line
2.34.1
#2 lore raw

PATCH v3 2/2 net: dsa: Remove adjust_link paths

In reply to Florian Fainelli

Now that we no longer any drivers using PHYLIB's adjust_link callback, remove all paths that made use of adjust_link as well as the associated functions.

---
 include/net/dsa.h |   7 ---
 net/dsa/dsa.c     |   3 +-
 net/dsa/port.c    | 139 ++++------------------------------------------
 3 files changed, 12 insertions(+), 137 deletions(-)
include/net/dsa.h +0 -7
index 678f1fd8b189..eef702dbea78 100644
@@ -24,8 +24,6 @@
 
 struct dsa_8021q_context;
 struct tc_action;
-struct phy_device;
-struct phylink_link_state;
 
 #define DSA_TAG_PROTO_NONE_VALUE		0
 #define DSA_TAG_PROTO_BRCM_VALUE		1
@@ -867,11 +865,6 @@ struct dsa_switch_ops {
 	int	(*phy_write)(struct dsa_switch *ds, int port,
 			     int regnum, u16 val);
 
-	/*
-	 * Link state adjustment (called from libphy)
-	 */
-	void	(*adjust_link)(struct dsa_switch *ds, int port,
-				struct phy_device *phydev);
 	/*
 	 * PHYLINK integration
 	 */
net/dsa/dsa.c +1 -2
index 2f347cd37316..12521a7d4048 100644
@@ -1511,8 +1511,7 @@ static int dsa_switch_probe(struct dsa_switch *ds)
 		    ds->ops->phylink_mac_config ||
 		    ds->ops->phylink_mac_finish ||
 		    ds->ops->phylink_mac_link_down ||
-		    ds->ops->phylink_mac_link_up ||
-		    ds->ops->adjust_link)
+		    ds->ops->phylink_mac_link_up)
 			return -EINVAL;
 	}
 
net/dsa/port.c +11 -128

186 lines not on this page · raw message

Signature · 1 line
2.34.1
Reviewed-by on the v3 series
#3 lore raw
In reply to Florian Fainelli
Quoted 3 lines · Florian Fainelli

Now that the last in-tree driver (b53) has been converted to PHYLINK, we can get rid of all of code that catered to working with drivers implementing only PHYLIB's adjust_link callback.

LGTM. For the whole series:

Thanks!

Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
#4 lore raw
In reply to Florian Fainelli
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 10 lines · On Tue, 30 Apr 2024 09:48:14 -0700 you wrote:

Now that the last in-tree driver (b53) has been converted to PHYLINK, we can get rid of all of code that catered to working with drivers implementing only PHYLIB's adjust_link callback.

Changes in v3:

- removed additional code in dsa_port_phylink_mac_link_down pertaining to the phy_device reference

[...]

Here is the summary with links:
- [net-next,v3,1/2] net: dsa: Remove fixed_link_update member

    https://git.kernel.org/netdev/net-next/c/ad3e1287c6f3
  - [net-next,v3,2/2] net: dsa: Remove adjust_link paths
    https://git.kernel.org/netdev/net-next/c/8a021a863a7d

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html