Skip to content

Commit 25cba90

Browse files
dTenebraemartinkpetersen
authored andcommitted
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>
1 parent 84e4697 commit 25cba90

3 files changed

Lines changed: 3 additions & 8 deletions

File tree

drivers/scsi/isci/request.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -738,8 +738,7 @@ static enum sci_status sci_io_request_construct_basic_ssp(struct isci_request *i
738738
return SCI_SUCCESS;
739739
}
740740

741-
enum sci_status sci_task_request_construct_ssp(
742-
struct isci_request *ireq)
741+
void sci_task_request_construct_ssp(struct isci_request *ireq)
743742
{
744743
/* Construct the SSP Task SCU Task Context */
745744
scu_ssp_task_request_construct_task_context(ireq);
@@ -748,8 +747,6 @@ enum sci_status sci_task_request_construct_ssp(
748747
sci_task_request_build_ssp_task_iu(ireq);
749748

750749
sci_change_state(&ireq->sm, SCI_REQ_CONSTRUCTED);
751-
752-
return SCI_SUCCESS;
753750
}
754751

755752
static enum sci_status sci_io_request_construct_basic_sata(struct isci_request *ireq)

drivers/scsi/isci/request.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ sci_task_request_construct(struct isci_host *ihost,
300300
struct isci_remote_device *idev,
301301
u16 io_tag,
302302
struct isci_request *ireq);
303-
enum sci_status sci_task_request_construct_ssp(struct isci_request *ireq);
303+
void sci_task_request_construct_ssp(struct isci_request *ireq);
304304
void sci_smp_request_copy_response(struct isci_request *ireq);
305305

306306
static inline int isci_task_is_ncq_recovery(struct sas_task *task)

drivers/scsi/isci/task.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,7 @@ static struct isci_request *isci_task_request_build(struct isci_host *ihost,
243243
/* XXX convert to get this from task->tproto like other drivers */
244244
if (dev->dev_type == SAS_END_DEVICE) {
245245
isci_tmf->proto = SAS_PROTOCOL_SSP;
246-
status = sci_task_request_construct_ssp(ireq);
247-
if (status != SCI_SUCCESS)
248-
return NULL;
246+
sci_task_request_construct_ssp(ireq);
249247
}
250248

251249
return ireq;

0 commit comments

Comments
 (0)