2023-10-20 02:34:42

by Su Hui

[permalink] [raw]
Subject: [PATCH v2] scsi: snici: remove useless code in snic_dr_clean_pending_req

return error code directly to save space and be more clear.

Signed-off-by: Su Hui <[email protected]>
---
drivers/scsi/snic/snic_scsi.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/scsi/snic/snic_scsi.c b/drivers/scsi/snic/snic_scsi.c
index c50ede326cc4..84973f0f771e 100644
--- a/drivers/scsi/snic/snic_scsi.c
+++ b/drivers/scsi/snic/snic_scsi.c
@@ -1850,7 +1850,7 @@ snic_dr_clean_pending_req(struct snic *snic, struct scsi_cmnd *lr_sc)
{
struct scsi_device *lr_sdev = lr_sc->device;
u32 tag = 0;
- int ret = FAILED;
+ int ret;

for (tag = 0; tag < snic->max_tag_id; tag++) {
if (tag == snic_cmd_tag(lr_sc))
@@ -1859,7 +1859,6 @@ snic_dr_clean_pending_req(struct snic *snic, struct scsi_cmnd *lr_sc)
ret = snic_dr_clean_single_req(snic, tag, lr_sdev);
if (ret) {
SNIC_HOST_ERR(snic->shost, "clean_err:tag = %d\n", tag);
-
goto clean_err;
}
}
@@ -1867,24 +1866,19 @@ snic_dr_clean_pending_req(struct snic *snic, struct scsi_cmnd *lr_sc)
schedule_timeout(msecs_to_jiffies(100));

/* Walk through all the cmds and check abts status. */
- if (snic_is_abts_pending(snic, lr_sc)) {
- ret = FAILED;
-
+ if (snic_is_abts_pending(snic, lr_sc))
goto clean_err;
- }

- ret = 0;
SNIC_SCSI_DBG(snic->shost, "clean_pending_req: Success.\n");

- return ret;
+ return 0;

clean_err:
- ret = FAILED;
SNIC_HOST_ERR(snic->shost,
"Failed to Clean Pending IOs on %s device.\n",
dev_name(&lr_sdev->sdev_gendev));

- return ret;
+ return FAILED;

} /* end of snic_dr_clean_pending_req */

--
2.30.2


2023-10-20 06:51:57

by Dan Carpenter

[permalink] [raw]
Subject: Re: [PATCH v2] scsi: snici: remove useless code in snic_dr_clean_pending_req

On Fri, Oct 20, 2023 at 10:33:27AM +0800, Su Hui wrote:
> return error code directly to save space and be more clear.
>
> Signed-off-by: Su Hui <[email protected]>
> ---

Thanks!

Reviewed-by: Dan Carpenter <[email protected]>

regards,
dan carpenter

2023-10-30 15:35:34

by Martin K. Petersen

[permalink] [raw]
Subject: Re: [PATCH v2] scsi: snici: remove useless code in snic_dr_clean_pending_req

On Fri, 20 Oct 2023 10:33:27 +0800, Su Hui wrote:

> return error code directly to save space and be more clear.
>
>

Applied to 6.7/scsi-queue, thanks!

[1/1] scsi: snici: remove useless code in snic_dr_clean_pending_req
https://git.kernel.org/mkp/scsi/c/44a31659ea60

--
Martin K. Petersen Oracle Linux Engineering