From: Colin Ian King Date: Thu, 17 Jul 2025 11:21:08 +0000 (+0100) Subject: RDMA/mlx5: remove redundant check on err on return expression X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aee80e6ffc5878a90ca5c16760b2c4f3f3d7343f;p=thirdparty%2Flinux.git RDMA/mlx5: remove redundant check on err on return expression Currently all paths that set err and then check it for an error perform immediate returns, hence err always zero at the end of the function _mlx5r_umr_zap_mkey. The return expression err ? err : nblocks has a redundant check on the err since err is always zero, so just return nblocks instead. Signed-off-by: Colin Ian King Link: https://patch.msgid.link/20250717112108.4036171-1-colin.i.king@gmail.com Signed-off-by: Leon Romanovsky --- diff --git a/drivers/infiniband/hw/mlx5/umr.c b/drivers/infiniband/hw/mlx5/umr.c index b097d8839cad0..fa5c4ea685b9d 100644 --- a/drivers/infiniband/hw/mlx5/umr.c +++ b/drivers/infiniband/hw/mlx5/umr.c @@ -1050,7 +1050,7 @@ static int _mlx5r_umr_zap_mkey(struct mlx5_ib_mr *mr, } } - return err ? err : nblocks; + return nblocks; } /**