From 279438952b7f5423f33ce4ddf639a7e796377b59 Mon Sep 17 00:00:00 2001 From: Ido Schimmel Date: Mon, 20 Jun 2016 23:04:05 +0200 Subject: [PATCH] mlxsw: spectrum: Remove unnecessary function argument The argument 'br_dev' is never used, so remove it. Signed-off-by: Ido Schimmel Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller --- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index 3500a72db437..cd853166d518 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -2708,8 +2708,7 @@ static void mlxsw_sp_master_bridge_inc(struct mlxsw_sp *mlxsw_sp, mlxsw_sp->master_bridge.ref_count++; } -static void mlxsw_sp_master_bridge_dec(struct mlxsw_sp *mlxsw_sp, - struct net_device *br_dev) +static void mlxsw_sp_master_bridge_dec(struct mlxsw_sp *mlxsw_sp) { if (--mlxsw_sp->master_bridge.ref_count == 0) mlxsw_sp->master_bridge.dev = NULL; @@ -2911,7 +2910,7 @@ static void mlxsw_sp_port_lag_leave(struct mlxsw_sp_port *mlxsw_sp_port, if (mlxsw_sp_port->bridged) { mlxsw_sp_port_active_vlans_del(mlxsw_sp_port); mlxsw_sp_port_bridge_leave(mlxsw_sp_port, false); - mlxsw_sp_master_bridge_dec(mlxsw_sp, NULL); + mlxsw_sp_master_bridge_dec(mlxsw_sp); } if (lag->ref_count == 1) { @@ -3055,7 +3054,7 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *dev, mlxsw_sp_master_bridge_inc(mlxsw_sp, upper_dev); } else { mlxsw_sp_port_bridge_leave(mlxsw_sp_port, true); - mlxsw_sp_master_bridge_dec(mlxsw_sp, upper_dev); + mlxsw_sp_master_bridge_dec(mlxsw_sp); } } else if (netif_is_lag_master(upper_dev)) { if (info->linking) -- 2.20.1