Commit 25cba909 authored by Artem Chernyshev's avatar Artem Chernyshev Committed by Martin K. Petersen
Browse files

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: default avatarArtem Chernyshev <artem.chernyshev@red-soft.ru>
Link: https://lore.kernel.org/r/20231128121159.2373975-1-artem.chernyshev@red-soft.ru


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 84e46978

drivers/scsi/isci/request.c

+1 −4
Original line number Diff line number Diff line
@@ -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)

drivers/scsi/isci/request.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/scsi/isci/task.c

+1 −3
Original line number Diff line number Diff line
@@ -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;