From: Ido Schimmel Date: Tue, 12 Feb 2019 16:29:52 +0000 (+0000) Subject: mlxsw: spectrum_router: Drop unnecessary WARN_ON_ONCE() X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=24f91ce0d27c535b3f91fc4e6627a3761db094c4;p=android-x86%2Fkernel.git mlxsw: spectrum_router: Drop unnecessary WARN_ON_ONCE() In case the register access failed an error would be logged anyway, so we can drop the warning. Signed-off-by: Ido Schimmel Acked-by: Jiri Pirko Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index 818040ce4d68..52fed8c7bf1e 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -6142,7 +6142,7 @@ static int mlxsw_sp_router_rif_disable(struct mlxsw_sp *mlxsw_sp, u16 rif) mlxsw_reg_ritr_rif_pack(ritr_pl, rif); err = mlxsw_reg_query(mlxsw_sp->core, MLXSW_REG(ritr), ritr_pl); - if (WARN_ON_ONCE(err)) + if (err) return err; mlxsw_reg_ritr_enable_set(ritr_pl, false);