Skip to contentSkip to conversation

mlxsw: Remove some unused code

PATCH Applied Petr Machata 2 participants 5 messages Aug 24, 2022 – Aug 25, 2022

Subsystems (3)
Networking Network drivers Mellanox Ethernet switch drivers
lore
Share & tools
lore

Petr Machata

author maintainer
#0 lore raw

cover mlxsw: Remove some unused code

This patchset removes code that is not used anymore after the following two commits removed all users:

- commit b0d80c013b04 ("mlxsw: Remove Mellanox SwitchX-2 ASIC support")
- commit 9b43fbb8ce24 ("mlxsw: Remove Mellanox SwitchIB ASIC support")

Jiri Pirko (3):
mlxsw: Remove unused IB stuff
mlxsw: Remove unused port_type_set devlink op
mlxsw: Remove unused mlxsw_core_port_type_get()

 drivers/net/ethernet/mellanox/mlxsw/core.c | 40 ----------
 drivers/net/ethernet/mellanox/mlxsw/core.h |  6 --
 drivers/net/ethernet/mellanox/mlxsw/reg.h  | 92 ----------------------
 3 files changed, 138 deletions(-)
Signature · 1 line
2.35.3
author maintainer
#1 lore raw

PATCH 1/3 mlxsw: Remove unused IB stuff

From: Jiri Pirko <[email protected]>

There are some IB leftovers that are no longer used in the code. So remove them.

Signed-off-by Jiri Pirko <[email protected]>
Reviewed-by Ido Schimmel <[email protected]>
Signed-off-by Petr Machata <[email protected]>
---
 drivers/net/ethernet/mellanox/mlxsw/core.c | 12 ---
 drivers/net/ethernet/mellanox/mlxsw/core.h |  2 -
 drivers/net/ethernet/mellanox/mlxsw/reg.h  | 92 ----------------------
 3 files changed, 106 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core.c +0 -12
index 450dcd9951bb..d28c0f999f76 100644
@@ -3183,18 +3183,6 @@ void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u16 local_port,
 }
 EXPORT_SYMBOL(mlxsw_core_port_eth_set);
 
-void mlxsw_core_port_ib_set(struct mlxsw_core *mlxsw_core, u16 local_port,
-			    void *port_driver_priv)
-{
-	struct mlxsw_core_port *mlxsw_core_port =
-					&mlxsw_core->ports[local_port];
-	struct devlink_port *devlink_port = &mlxsw_core_port->devlink_port;
-
-	mlxsw_core_port->port_driver_priv = port_driver_priv;
-	devlink_port_type_ib_set(devlink_port, NULL);
-}
-EXPORT_SYMBOL(mlxsw_core_port_ib_set);
-
 void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u16 local_port,
 			   void *port_driver_priv)
 {
drivers/net/ethernet/mellanox/mlxsw/core.h +0 -2
index c7c0b3cefd8d..ca42783f143f 100644
@@ -264,8 +264,6 @@ int mlxsw_core_cpu_port_init(struct mlxsw_core *mlxsw_core,
 void mlxsw_core_cpu_port_fini(struct mlxsw_core *mlxsw_core);
 void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u16 local_port,
 			     void *port_driver_priv, struct net_device *dev);
-void mlxsw_core_port_ib_set(struct mlxsw_core *mlxsw_core, u16 local_port,
-			    void *port_driver_priv);
 void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u16 local_port,
 			   void *port_driver_priv);
 enum devlink_port_type mlxsw_core_port_type_get(struct mlxsw_core *mlxsw_core,
drivers/net/ethernet/mellanox/mlxsw/reg.h +0 -92

128 lines not on this page · raw message

Signature · 1 line
2.35.3
author maintainer
#2 lore raw

PATCH 2/3 mlxsw: Remove unused port_type_set devlink op

In reply to Petr Machata

From: Jiri Pirko <[email protected]>

port_type_set devlink op is no longer used by any mlxsw driver, so remove it.

Signed-off-by Jiri Pirko <[email protected]>
Reviewed-by Ido Schimmel <[email protected]>
Signed-off-by Petr Machata <[email protected]>
---
 drivers/net/ethernet/mellanox/mlxsw/core.c | 16 ----------------
 drivers/net/ethernet/mellanox/mlxsw/core.h |  2 --
 2 files changed, 18 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core.c +0 -16
index d28c0f999f76..250e1236b308 100644
@@ -1307,21 +1307,6 @@ mlxsw_devlink_sb_pool_set(struct devlink *devlink,
 					 extack);
 }
 
-static int mlxsw_devlink_port_type_set(struct devlink_port *devlink_port,
-				       enum devlink_port_type port_type)
-{
-	struct mlxsw_core *mlxsw_core = devlink_priv(devlink_port->devlink);
-	struct mlxsw_driver *mlxsw_driver = mlxsw_core->driver;
-	struct mlxsw_core_port *mlxsw_core_port = __dl_port(devlink_port);
-
-	if (!mlxsw_driver->port_type_set)
-		return -EOPNOTSUPP;
-
-	return mlxsw_driver->port_type_set(mlxsw_core,
-					   mlxsw_core_port->local_port,
-					   port_type);
-}
-
 static int mlxsw_devlink_sb_port_pool_get(struct devlink_port *devlink_port,
 					  unsigned int sb_index, u16 pool_index,
 					  u32 *p_threshold)

@@ -1652,7 +1637,6 @@ static const struct devlink_ops mlxsw_devlink_ops = {
 				  BIT(DEVLINK_RELOAD_ACTION_FW_ACTIVATE),
 	.reload_down		= mlxsw_devlink_core_bus_device_reload_down,
 	.reload_up		= mlxsw_devlink_core_bus_device_reload_up,
-	.port_type_set			= mlxsw_devlink_port_type_set,
 	.port_split			= mlxsw_devlink_port_split,
 	.port_unsplit			= mlxsw_devlink_port_unsplit,
 	.sb_pool_get			= mlxsw_devlink_sb_pool_get,
drivers/net/ethernet/mellanox/mlxsw/core.h +0 -2
index ca42783f143f..8100a7efef90 100644
@@ -347,8 +347,6 @@ struct mlxsw_driver {
 		    const struct mlxsw_bus_info *mlxsw_bus_info,
 		    struct netlink_ext_ack *extack);
 	void (*fini)(struct mlxsw_core *mlxsw_core);
-	int (*port_type_set)(struct mlxsw_core *mlxsw_core, u16 local_port,
-			     enum devlink_port_type new_type);
 	int (*port_split)(struct mlxsw_core *mlxsw_core, u16 local_port,
 			  unsigned int count, struct netlink_ext_ack *extack);
 	int (*port_unsplit)(struct mlxsw_core *mlxsw_core, u16 local_port,
Signature · 1 line
2.35.3
author maintainer
#3 lore raw

PATCH 3/3 mlxsw: Remove unused mlxsw_core_port_type_get()

In reply to Petr Machata

From: Jiri Pirko <[email protected]>

Function mlxsw_core_port_type_get() is no longer used. So remove it.

Signed-off-by Jiri Pirko <[email protected]>
Reviewed-by Ido Schimmel <[email protected]>
Signed-off-by Petr Machata <[email protected]>
---
 drivers/net/ethernet/mellanox/mlxsw/core.c | 12 ------------
 drivers/net/ethernet/mellanox/mlxsw/core.h |  2 --
 2 files changed, 14 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core.c +0 -12
index 250e1236b308..afbe046b35a0 100644
@@ -3179,18 +3179,6 @@ void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u16 local_port,
 }
 EXPORT_SYMBOL(mlxsw_core_port_clear);
 
-enum devlink_port_type mlxsw_core_port_type_get(struct mlxsw_core *mlxsw_core,
-						u16 local_port)
-{
-	struct mlxsw_core_port *mlxsw_core_port =
-					&mlxsw_core->ports[local_port];
-	struct devlink_port *devlink_port = &mlxsw_core_port->devlink_port;
-
-	return devlink_port->type;
-}
-EXPORT_SYMBOL(mlxsw_core_port_type_get);
-
-
 struct devlink_port *
 mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core,
 				 u16 local_port)
drivers/net/ethernet/mellanox/mlxsw/core.h +0 -2
index 8100a7efef90..9de9fa24f27c 100644
@@ -266,8 +266,6 @@ void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u16 local_port,
 			     void *port_driver_priv, struct net_device *dev);
 void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u16 local_port,
 			   void *port_driver_priv);
-enum devlink_port_type mlxsw_core_port_type_get(struct mlxsw_core *mlxsw_core,
-						u16 local_port);
 struct devlink_port *
 mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core,
 				 u16 local_port);
Signature · 1 line
2.35.3
CI Applied
#4 lore raw
In reply to Petr Machata
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Hello:

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

Quoted 6 lines · On Wed, 24 Aug 2022 17:18:48 +0200 you wrote:

This patchset removes code that is not used anymore after the following two commits removed all users:

- commit b0d80c013b04 ("mlxsw: Remove Mellanox SwitchX-2 ASIC support")
- commit 9b43fbb8ce24 ("mlxsw: Remove Mellanox SwitchIB ASIC support")

Quoted 6 lines

Jiri Pirko (3):
mlxsw: Remove unused IB stuff
mlxsw: Remove unused port_type_set devlink op
mlxsw: Remove unused mlxsw_core_port_type_get()

[...]

Here is the summary with links:
- [net-next,1/3] mlxsw: Remove unused IB stuff

    https://git.kernel.org/netdev/net-next/c/3471ac9b22c1
  - [net-next,2/3] mlxsw: Remove unused port_type_set devlink op
    https://git.kernel.org/netdev/net-next/c/04a1b674d655
  - [net-next,3/3] mlxsw: Remove unused mlxsw_core_port_type_get()
    https://git.kernel.org/netdev/net-next/c/12be3edfa827

You are awesome, thank you!

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