[PATCH] scsi: snic: Remove unnecessary condition to simplify the code

[PATCH] scsi: snic: Remove unnecessary condition to simplify the code

[Jing Xiangfeng]

ret is always zero or an error in this code path. So the assignment to
ret is redundant, and the code jumping to a label is unneed.
Let's remove them to simplify the code. No functional changes.

Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
---
 drivers/scsi/snic/snic_scsi.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/scsi/snic/snic_scsi.c b/drivers/scsi/snic/snic_scsi.c
index b3650c989ed4..0c2f31b8ea05 100644
--- a/drivers/scsi/snic/snic_scsi.c
+++ b/drivers/scsi/snic/snic_scsi.c
@@ -1387,10 +1387,6 @@ snic_issue_tm_req(struct snic *snic,
 	}
 
 	ret = snic_queue_itmf_req(snic, tmreq, sc, tmf, req_id);
-	if (ret)
-		goto tmreq_err;
-
-	ret = 0;
 
 tmreq_err:
 	if (ret) {
-- 
2.17.1

RE: [PATCH] scsi: snic: Remove unnecessary condition to simplify the code

[Karan Tilak Kumar (kartilak)]

Looks good to me.

Signed off by: Karan Tilak Kumar <kartilak@cisco.com>

Regards,
Karan

-----Original Message-----
From: Jing Xiangfeng <jingxiangfeng@huawei.com> 
Sent: Thursday, September 24, 2020 11:08 PM
To: Karan Tilak Kumar (kartilak) <kartilak@cisco.com>; Sesidhar Baddela (sebaddel) <sebaddel@cisco.com>; jejb@linux.ibm.com; martin.petersen@oracle.com
Cc: linux-scsi@vger.kernel.org; linux-kernel@vger.kernel.org; jingxiangfeng@huawei.com
Subject: [PATCH] scsi: snic: Remove unnecessary condition to simplify the code

ret is always zero or an error in this code path. So the assignment to ret is redundant, and the code jumping to a label is unneed.
Let's remove them to simplify the code. No functional changes.

Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
---
 drivers/scsi/snic/snic_scsi.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/scsi/snic/snic_scsi.c b/drivers/scsi/snic/snic_scsi.c index b3650c989ed4..0c2f31b8ea05 100644
--- a/drivers/scsi/snic/snic_scsi.c
+++ b/drivers/scsi/snic/snic_scsi.c
@@ -1387,10 +1387,6 @@ snic_issue_tm_req(struct snic *snic,
 	}
 
 	ret = snic_queue_itmf_req(snic, tmreq, sc, tmf, req_id);
-	if (ret)
-		goto tmreq_err;
-
-	ret = 0;
 
 tmreq_err:
 	if (ret) {
--
2.17.1

Re: [PATCH] scsi: snic: Remove unnecessary condition to simplify the code

[Martin K. Petersen]

Jing,

> ret is always zero or an error in this code path. So the assignment to
> ret is redundant, and the code jumping to a label is unneed.
> Let's remove them to simplify the code. No functional changes.

Applied to 5.10/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH] scsi: snic: Remove unnecessary condition to simplify the code

[Martin K. Petersen]

On Fri, 25 Sep 2020 14:07:54 +0800, Jing Xiangfeng wrote:

> ret is always zero or an error in this code path. So the assignment to
> ret is redundant, and the code jumping to a label is unneed.
> Let's remove them to simplify the code. No functional changes.

Applied to 5.10/scsi-queue, thanks!

[1/1] scsi: snic: Remove unnecessary condition
      https://git.kernel.org/mkp/scsi/c/2a7869d6c9a1

-- 
Martin K. Petersen	Oracle Linux Engineering