Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 423b937e authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum: Use WARN_ON() return value 



Instead of checking for a condition and then issue the warning, just do
it in one go and simplify the code.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ddbe993d

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+4 −12
Original line number Diff line number Diff line
@@ -2980,10 +2980,8 @@ static int mlxsw_sp_port_vlan_link(struct mlxsw_sp_port *mlxsw_sp_port, 
	u16 vid = vlan_dev_vlan_id(vlan_dev);



	mlxsw_sp_vport = mlxsw_sp_port_vport_find(mlxsw_sp_port, vid);

	if (!mlxsw_sp_vport) {

		WARN_ON(!mlxsw_sp_vport);

	if (WARN_ON(!mlxsw_sp_vport))

		return -EINVAL;

	}



	mlxsw_sp_vport->dev = vlan_dev;
@@ -2997,10 +2995,8 @@ static int mlxsw_sp_port_vlan_unlink(struct mlxsw_sp_port *mlxsw_sp_port, 
	u16 vid = vlan_dev_vlan_id(vlan_dev);



	mlxsw_sp_vport = mlxsw_sp_port_vport_find(mlxsw_sp_port, vid);

	if (!mlxsw_sp_vport) {

		WARN_ON(!mlxsw_sp_vport);

	if (WARN_ON(!mlxsw_sp_vport))

		return -EINVAL;

	}



	/* When removing a VLAN device while still bridged we should first

	 * remove it from the bridge, as we receive the bridge's notification
@@ -3236,10 +3232,8 @@ static int mlxsw_sp_vport_bridge_leave(struct mlxsw_sp_port *mlxsw_sp_vport, 
	int err;



	vfid = mlxsw_sp_br_vfid_find(mlxsw_sp, br_dev);

	if (!vfid) {

		WARN_ON(!vfid);

	if (WARN_ON(!vfid))

		return -EINVAL;

	}



	/* We need a vFID to go back to after leaving the bridge's vFID. */

	new_vfid = mlxsw_sp_vfid_find(mlxsw_sp, vid);
@@ -3454,10 +3448,8 @@ static int mlxsw_sp_netdevice_vport_event(struct net_device *dev, 
	case NETDEV_CHANGEUPPER:

		upper_dev = info->upper_dev;

		if (info->linking) {

			if (!mlxsw_sp_vport) {

				WARN_ON(!mlxsw_sp_vport);

			if (WARN_ON(!mlxsw_sp_vport))

				return -EINVAL;

			}

			err = mlxsw_sp_vport_bridge_join(mlxsw_sp_vport,

							 upper_dev);

		} else {