scsi: isci: Remove redundant check in isci_task_request_build()

sci_task_request_construct_ssp() has 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>
Link: https://lore.kernel.org/r/20231128121159.2373975-1-artem.chernyshev@red-soft.ru
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
index a7b3243b471d5b3b1180abd8ac709e2b97e777fe..71f711cb0628a70d40efc99520ef2dc807494e75 100644 (file)
--- 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 20b141739e4d93705f0b69979d083fb897457c14..79ddfffbf73cfe7b8d3a154c8ac05412ed585a13 100644 (file)
--- 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 c514b20293b2a74fb767bff43a17af4066822337..3a25b1a2c52dd5ad7b07d693c4524b78955a02ba 100644 (file)
--- 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;