shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-25 20:10:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Avri Altman <avri.altman@wdc.com>
Signed-off-by: Can Guo <cang@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

Bug: 189457922
(cherry picked from commit 4d195dc451
git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git 5.14/scsi-queue)
Change-Id: Iddecfaff6fe8ea0f1f3a26c8a1dab3a5033b4f54
Signed-off-by: Can Guo <cang@codeaurora.org>
This commit is contained in:
Can Guo
2021-02-23 21:36:49 -08:00
committed by Todd Kjos
parent 523a4fd3f4
commit ab20ac9696
1 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/scsi/ufs/ufshcd.c
View File

@@ -98,8 +98,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)
{
@@ -8954,11 +8952,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)
@@ -9013,14 +9006,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
@@ -9053,9 +9038,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
@@ -9094,9 +9076,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