mlxsw: spectrum: Remove unused function argument
authorIdo Schimmel <idosch@mellanox.com>
Mon, 20 Jun 2016 21:04:14 +0000 (23:04 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Jun 2016 09:02:50 +0000 (05:02 -0400)
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlxsw/spectrum.c

index ad8e4475f0ef60a88e252796e1f4a3cb5d6ece73..4869392b7d1528694d94e32c9afdb826007beb6a 100644 (file)
@@ -2872,7 +2872,6 @@ err_col_port_add:
 }
 
 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 @@ err_vport_br_vfid_join:
 }
 
 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);
                }
        }