mlxsw: spectrum: Remove unused function argument

idosch · davem330 · commit 37286d2571cc · 2016-06-21T05:02:50.000-04:00
Signed-off-by: Ido Schimmel &lt;idosch@mellanox.com&gt;
Signed-off-by: Jiri Pirko &lt;jiri@mellanox.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -2872,7 +2872,6 @@ static int mlxsw_sp_port_lag_join(struct mlxsw_sp_port *mlxsw_sp_port,
 }
 
 static void mlxsw_sp_vport_bridge_leave(struct mlxsw_sp_port *mlxsw_sp_vport,
-					struct net_device *br_dev,
 					bool flush_fdb);
 
 static void mlxsw_sp_port_lag_leave(struct mlxsw_sp_port *mlxsw_sp_port,
@@ -2903,7 +2902,7 @@ static void mlxsw_sp_port_lag_leave(struct mlxsw_sp_port *mlxsw_sp_port,
 			continue;
 
 		br_dev = mlxsw_sp_vport_br_get(mlxsw_sp_vport);
-		mlxsw_sp_vport_bridge_leave(mlxsw_sp_vport, br_dev, false);
+		mlxsw_sp_vport_bridge_leave(mlxsw_sp_vport, false);
 	}
 
 	if (mlxsw_sp_port->bridged) {
@@ -2995,7 +2994,7 @@ static void mlxsw_sp_port_vlan_unlink(struct mlxsw_sp_port *mlxsw_sp_port,
 		struct net_device *br_dev;
 
 		br_dev = mlxsw_sp_vport_br_get(mlxsw_sp_vport);
-		mlxsw_sp_vport_bridge_leave(mlxsw_sp_vport, br_dev, true);
+		mlxsw_sp_vport_bridge_leave(mlxsw_sp_vport, true);
 	}
 
 	mlxsw_sp_vport->dev = mlxsw_sp_port->dev;
@@ -3290,7 +3289,6 @@ static int mlxsw_sp_vport_bridge_join(struct mlxsw_sp_port *mlxsw_sp_vport,
 }
 
 static void mlxsw_sp_vport_bridge_leave(struct mlxsw_sp_port *mlxsw_sp_vport,
-					struct net_device *br_dev,
 					bool flush_fdb)
 {
 	u16 vid = mlxsw_sp_vport_vid_get(mlxsw_sp_vport);
@@ -3369,8 +3367,7 @@ static int mlxsw_sp_netdevice_vport_event(struct net_device *dev,
 			 */
 			if (!mlxsw_sp_vport)
 				return 0;
-			mlxsw_sp_vport_bridge_leave(mlxsw_sp_vport, upper_dev,
-						    true);
+			mlxsw_sp_vport_bridge_leave(mlxsw_sp_vport, true);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2872,7 +2872,6 @@ static int mlxsw_sp_port_lag_join(struct mlxsw_sp_port *mlxsw_sp_port,`
`2872`	`2872`	`}`
`2873`	`2873`
`2874`	`2874`	`static void mlxsw_sp_vport_bridge_leave(struct mlxsw_sp_port *mlxsw_sp_vport,`
`2875`		`- struct net_device *br_dev,`
`2876`	`2875`	`bool flush_fdb);`
`2877`	`2876`
`2878`	`2877`	`static void mlxsw_sp_port_lag_leave(struct mlxsw_sp_port *mlxsw_sp_port,`
`@@ -2903,7 +2902,7 @@ static void mlxsw_sp_port_lag_leave(struct mlxsw_sp_port *mlxsw_sp_port,`
`2903`	`2902`	`continue;`
`2904`	`2903`
`2905`	`2904`	`br_dev = mlxsw_sp_vport_br_get(mlxsw_sp_vport);`
`2906`		`- mlxsw_sp_vport_bridge_leave(mlxsw_sp_vport, br_dev, false);`
	`2905`	`+ mlxsw_sp_vport_bridge_leave(mlxsw_sp_vport, false);`
`2907`	`2906`	`}`
`2908`	`2907`
`2909`	`2908`	`if (mlxsw_sp_port->bridged) {`
`@@ -2995,7 +2994,7 @@ static void mlxsw_sp_port_vlan_unlink(struct mlxsw_sp_port *mlxsw_sp_port,`
`2995`	`2994`	`struct net_device *br_dev;`
`2996`	`2995`
`2997`	`2996`	`br_dev = mlxsw_sp_vport_br_get(mlxsw_sp_vport);`
`2998`		`- mlxsw_sp_vport_bridge_leave(mlxsw_sp_vport, br_dev, true);`
	`2997`	`+ mlxsw_sp_vport_bridge_leave(mlxsw_sp_vport, true);`
`2999`	`2998`	`}`
`3000`	`2999`
`3001`	`3000`	`mlxsw_sp_vport->dev = mlxsw_sp_port->dev;`
`@@ -3290,7 +3289,6 @@ static int mlxsw_sp_vport_bridge_join(struct mlxsw_sp_port *mlxsw_sp_vport,`
`3290`	`3289`	`}`
`3291`	`3290`
`3292`	`3291`	`static void mlxsw_sp_vport_bridge_leave(struct mlxsw_sp_port *mlxsw_sp_vport,`
`3293`		`- struct net_device *br_dev,`
`3294`	`3292`	`bool flush_fdb)`
`3295`	`3293`	`{`
`3296`	`3294`	`u16 vid = mlxsw_sp_vport_vid_get(mlxsw_sp_vport);`
`@@ -3369,8 +3367,7 @@ static int mlxsw_sp_netdevice_vport_event(struct net_device *dev,`
`3369`	`3367`	`*/`
`3370`	`3368`	`if (!mlxsw_sp_vport)`
`3371`	`3369`	`return 0;`
`3372`		`- mlxsw_sp_vport_bridge_leave(mlxsw_sp_vport, upper_dev,`
`3373`		`- true);`
	`3370`	`+ mlxsw_sp_vport_bridge_leave(mlxsw_sp_vport, true);`
`3374`	`3371`	`}`
`3375`	`3372`	`}`
`3376`	`3373`