From: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Date: Tue, 19 May 2020 11:36:12 -0500
Subject: RDMA/rtrs: client: Fix function return on success
Patch-mainline: v5.8-rc1
Git-commit: e19840867013f0f4081265fdb65b31e80b7bcb5b
References: jsc#SLE-15176

Remove the if-statement and return the value contained in _err_,
unconditionally.

Link: https://lore.kernel.org/r/20200519163612.GA6043@embeddedor
Addresses-Coverity-ID: 1493753 ("Identical code for different branches")
Fixes: 6a98d71daea1 ("RDMA/rtrs: client: main functionality")
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
 drivers/infiniband/ulp/rtrs/rtrs-clt.c |    3 ---
 1 file changed, 3 deletions(-)

--- a/drivers/infiniband/ulp/rtrs/rtrs-clt.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
@@ -1590,9 +1590,6 @@ static int create_con_cq_qp(struct rtrs_
 	 * In case of error we do not bother to clean previous allocations,
 	 * since destroy_con_cq_qp() must be called.
 	 */
-
-	if (err)
-		return err;
 	return err;
 }