Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12b91f36 authored by Yihang Li's avatar Yihang Li Committed by Greg Kroah-Hartman
Browse files

scsi: hisi_sas: Replace with standard error code return value 



[ Upstream commit d34ee535705eb43885bc0f561c63046f697355ad ]

In function hisi_sas_controller_prereset(), -ENOSYS (Function not
implemented) should be returned if the driver does not support .soft_reset.
Returns -EPERM (Operation not permitted) if HISI_SAS_RESETTING_BIT is
already be set.

In function _suspend_v3_hw(), returns -EPERM (Operation not permitted) if
HISI_SAS_RESETTING_BIT is already be set.

Fixes: 4522204a ("scsi: hisi_sas: tidy host controller reset function a bit")
Signed-off-by: default avatarYihang Li <liyihang9@huawei.com>
Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Link: https://lore.kernel.org/r/1702525516-51258-3-git-send-email-chenxiang66@hisilicon.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 14470da0

drivers/scsi/hisi_sas/hisi_sas_main.c

+2 −2
Original line number Diff line number Diff line
@@ -1577,10 +1577,10 @@ static int hisi_sas_controller_reset(struct hisi_hba *hisi_hba) 
		queue_work(hisi_hba->wq, &hisi_hba->debugfs_work);



	if (!hisi_hba->hw->soft_reset)

		return -1;

		return -ENOENT;



	if (test_and_set_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags))

		return -1;

		return -EPERM;



	dev_info(dev, "controller resetting...\n");

	hisi_sas_controller_reset_prepare(hisi_hba);

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -3365,7 +3365,7 @@ static int hisi_sas_v3_suspend(struct pci_dev *pdev, pm_message_t state) 
	}



	if (test_and_set_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags))

		return -1;

		return -EPERM;



	scsi_block_requests(shost);

	set_bit(HISI_SAS_REJECT_CMD_BIT, &hisi_hba->flags);