[PATCH] scsi: isci: Remove redundant check in isci_task_request_build()

[PATCH] scsi: isci: Remove redundant check in isci_task_request_build()

[Artem Chernyshev]

 sci_task_request_construct_ssp() have invariant return. Change
 this function to void and get rid of unnecessary checks.

 Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Artem Chernyshev <artem.chernyshev@red-soft.ru>
---
 drivers/scsi/isci/request.c | 5 +----
 drivers/scsi/isci/request.h | 2 +-
 drivers/scsi/isci/task.c    | 4 +---
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
index a7b3243b471d..71f711cb0628 100644
--- a/drivers/scsi/isci/request.c
+++ b/drivers/scsi/isci/request.c
@@ -738,8 +738,7 @@ static enum sci_status sci_io_request_construct_basic_ssp(struct isci_request *i
 	return SCI_SUCCESS;
 }
 
-enum sci_status sci_task_request_construct_ssp(
-	struct isci_request *ireq)
+void sci_task_request_construct_ssp(struct isci_request *ireq)
 {
 	/* Construct the SSP Task SCU Task Context */
 	scu_ssp_task_request_construct_task_context(ireq);
@@ -748,8 +747,6 @@ enum sci_status sci_task_request_construct_ssp(
 	sci_task_request_build_ssp_task_iu(ireq);
 
 	sci_change_state(&ireq->sm, SCI_REQ_CONSTRUCTED);
-
-	return SCI_SUCCESS;
 }
 
 static enum sci_status sci_io_request_construct_basic_sata(struct isci_request *ireq)
diff --git a/drivers/scsi/isci/request.h b/drivers/scsi/isci/request.h
index 20b141739e4d..79ddfffbf73c 100644
--- a/drivers/scsi/isci/request.h
+++ b/drivers/scsi/isci/request.h
@@ -300,7 +300,7 @@ sci_task_request_construct(struct isci_host *ihost,
 			    struct isci_remote_device *idev,
 			    u16 io_tag,
 			    struct isci_request *ireq);
-enum sci_status sci_task_request_construct_ssp(struct isci_request *ireq);
+void sci_task_request_construct_ssp(struct isci_request *ireq);
 void sci_smp_request_copy_response(struct isci_request *ireq);
 
 static inline int isci_task_is_ncq_recovery(struct sas_task *task)
diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c
index c514b20293b2..3a25b1a2c52d 100644
--- a/drivers/scsi/isci/task.c
+++ b/drivers/scsi/isci/task.c
@@ -243,9 +243,7 @@ static struct isci_request *isci_task_request_build(struct isci_host *ihost,
 	/* XXX convert to get this from task->tproto like other drivers */
 	if (dev->dev_type == SAS_END_DEVICE) {
 		isci_tmf->proto = SAS_PROTOCOL_SSP;
-		status = sci_task_request_construct_ssp(ireq);
-		if (status != SCI_SUCCESS)
-			return NULL;
+		sci_task_request_construct_ssp(ireq);
 	}
 
 	return ireq;
-- 
2.37.3

Re: [PATCH] scsi: isci: Remove redundant check in isci_task_request_build()

[Martin K. Petersen]

Artem,

> sci_task_request_construct_ssp() have invariant return. Change this
> function to void and get rid of unnecessary checks.

Applied to 6.8/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH] scsi: isci: Remove redundant check in isci_task_request_build()

[Martin K. Petersen]

On Tue, 28 Nov 2023 15:11:59 +0300, Artem Chernyshev wrote:

>  sci_task_request_construct_ssp() have invariant return. Change
>  this function to void and get rid of unnecessary checks.
> 
>  Found by Linux Verification Center (linuxtesting.org) with SVACE.
> 
> 

Applied to 6.8/scsi-queue, thanks!

[1/1] scsi: isci: Remove redundant check in isci_task_request_build()
      https://git.kernel.org/mkp/scsi/c/25cba909ade2

-- 
Martin K. Petersen	Oracle Linux Engineering