Skip to content

Commit

Permalink
scsi: ufs: Remove redundant checks of !hba in suspend/resume callbacks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Can Guo authored and Martin K. Petersen committed Mar 4, 2021
1 parent 4a79157 commit 4d195dc
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions drivers/scsi/ufs/ufshcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 4d195dc

Please sign in to comment.