Commit 4d195dc4 authored by Can Guo's avatar Can Guo Committed by Martin K. Petersen
Browse files

scsi: ufs: Remove redundant checks of !hba in suspend/resume callbacks 

Runtime and system suspend/resume can only come after hba probe invokes
platform_set_drvdata(pdev, hba), meaning hba cannot be NULL in these PM
callbacks, so remove the checks of !hba.

Link: https://lore.kernel.org/r/1614145010-36079-4-git-send-email-cang@codeaurora.org


Reviewed-by: default avatarAvri Altman <avri.altman@wdc.com>
Signed-off-by: default avatarCan Guo <cang@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 4a791574

drivers/scsi/ufs/ufshcd.c

+0 −21
Original line number Diff line number Diff line
@@ -95,8 +95,6 @@ 
		       16, 4, buf, __len, false);                        \

} while (0)



static bool early_suspend;



int ufshcd_dump_regs(struct ufs_hba *hba, size_t offset, size_t len,

		     const char *prefix)

{
@@ -8978,11 +8976,6 @@ int ufshcd_system_suspend(struct ufs_hba *hba) 
	int ret = 0;

	ktime_t start = ktime_get();



	if (!hba) {

		early_suspend = true;

		return 0;

	}



	down(&hba->host_sem);



	if (!hba->is_powered)
@@ -9034,14 +9027,6 @@ int ufshcd_system_resume(struct ufs_hba *hba) 
	int ret = 0;

	ktime_t start = ktime_get();



	if (!hba)

		return -EINVAL;



	if (unlikely(early_suspend)) {

		early_suspend = false;

		down(&hba->host_sem);

	}



	if (!hba->is_powered || pm_runtime_suspended(hba->dev))

		/*

		 * Let the runtime resume take care of resuming
@@ -9074,9 +9059,6 @@ int ufshcd_runtime_suspend(struct ufs_hba *hba) 
	int ret = 0;

	ktime_t start = ktime_get();



	if (!hba)

		return -EINVAL;



	if (!hba->is_powered)

		goto out;

	else
@@ -9115,9 +9097,6 @@ int ufshcd_runtime_resume(struct ufs_hba *hba) 
	int ret = 0;

	ktime_t start = ktime_get();



	if (!hba)

		return -EINVAL;



	if (!hba->is_powered)

		goto out;

	else