openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ido Schimmel 2016-06-20 23:04:03 +02:00 committed by David S. Miller
parent ddbe993dbe
commit 423b937e7d
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/ethernet/mellanox/mlxsw/spectrum.c
View File

@ -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 {