| Message ID | 20201216131639.4128-2-stanley.chu@mediatek.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | scsi: ufs: Cleanup and refactor clock scaling | expand |
On 2020-12-16 21:16, Stanley Chu wrote: > Cancelling suspend_work and resume_work is only required while > suspending clk-scaling. Thus moving these two invokes into > ufshcd_suspend_clkscaling() function. > > Signed-off-by: Stanley Chu <stanley.chu@mediatek.com> > --- > drivers/scsi/ufs/ufshcd.c | 17 ++++++----------- > 1 file changed, 6 insertions(+), 11 deletions(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index 052479a56a6f..a91b73a1fc48 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -1451,6 +1451,9 @@ static void ufshcd_suspend_clkscaling(struct > ufs_hba *hba) > if (!ufshcd_is_clkscaling_supported(hba)) > return; > > + cancel_work_sync(&hba->clk_scaling.suspend_work); > + cancel_work_sync(&hba->clk_scaling.resume_work); > + > spin_lock_irqsave(hba->host->host_lock, flags); > if (!hba->clk_scaling.is_suspended) { > suspend = true; > @@ -1514,9 +1517,6 @@ static ssize_t > ufshcd_clkscale_enable_store(struct device *dev, > pm_runtime_get_sync(hba->dev); > ufshcd_hold(hba, false); > > - cancel_work_sync(&hba->clk_scaling.suspend_work); > - cancel_work_sync(&hba->clk_scaling.resume_work); > - > if (value) { > ufshcd_resume_clkscaling(hba); > } else { > @@ -5663,11 +5663,8 @@ static void ufshcd_err_handling_prepare(struct > ufs_hba *hba) > ufshcd_vops_resume(hba, UFS_RUNTIME_PM); > } else { > ufshcd_hold(hba, false); > - if (hba->clk_scaling.is_enabled) { > - cancel_work_sync(&hba->clk_scaling.suspend_work); > - cancel_work_sync(&hba->clk_scaling.resume_work); > + if (hba->clk_scaling.is_enabled) > ufshcd_suspend_clkscaling(hba); > - } > } > down_write(&hba->clk_scaling_lock); > hba->clk_scaling.is_allowed = false; > @@ -8512,11 +8509,9 @@ static int ufshcd_suspend(struct ufs_hba *hba, > enum ufs_pm_op pm_op) > ufshcd_hold(hba, false); > hba->clk_gating.is_suspended = true; > > - if (hba->clk_scaling.is_enabled) { > - cancel_work_sync(&hba->clk_scaling.suspend_work); > - cancel_work_sync(&hba->clk_scaling.resume_work); > + if (hba->clk_scaling.is_enabled) > ufshcd_suspend_clkscaling(hba); > - } > + > down_write(&hba->clk_scaling_lock); > hba->clk_scaling.is_allowed = false; > up_write(&hba->clk_scaling_lock); Reviewed-by: Can Guo <cang@codeaurora.org>
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 052479a56a6f..a91b73a1fc48 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -1451,6 +1451,9 @@ static void ufshcd_suspend_clkscaling(struct ufs_hba *hba) if (!ufshcd_is_clkscaling_supported(hba)) return; + cancel_work_sync(&hba->clk_scaling.suspend_work); + cancel_work_sync(&hba->clk_scaling.resume_work); + spin_lock_irqsave(hba->host->host_lock, flags); if (!hba->clk_scaling.is_suspended) { suspend = true; @@ -1514,9 +1517,6 @@ static ssize_t ufshcd_clkscale_enable_store(struct device *dev, pm_runtime_get_sync(hba->dev); ufshcd_hold(hba, false); - cancel_work_sync(&hba->clk_scaling.suspend_work); - cancel_work_sync(&hba->clk_scaling.resume_work); - if (value) { ufshcd_resume_clkscaling(hba); } else { @@ -5663,11 +5663,8 @@ static void ufshcd_err_handling_prepare(struct ufs_hba *hba) ufshcd_vops_resume(hba, UFS_RUNTIME_PM); } else { ufshcd_hold(hba, false); - if (hba->clk_scaling.is_enabled) { - cancel_work_sync(&hba->clk_scaling.suspend_work); - cancel_work_sync(&hba->clk_scaling.resume_work); + if (hba->clk_scaling.is_enabled) ufshcd_suspend_clkscaling(hba); - } } down_write(&hba->clk_scaling_lock); hba->clk_scaling.is_allowed = false; @@ -8512,11 +8509,9 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) ufshcd_hold(hba, false); hba->clk_gating.is_suspended = true; - if (hba->clk_scaling.is_enabled) { - cancel_work_sync(&hba->clk_scaling.suspend_work); - cancel_work_sync(&hba->clk_scaling.resume_work); + if (hba->clk_scaling.is_enabled) ufshcd_suspend_clkscaling(hba); - } + down_write(&hba->clk_scaling_lock); hba->clk_scaling.is_allowed = false; up_write(&hba->clk_scaling_lock);
Cancelling suspend_work and resume_work is only required while suspending clk-scaling. Thus moving these two invokes into ufshcd_suspend_clkscaling() function. Signed-off-by: Stanley Chu <stanley.chu@mediatek.com> --- drivers/scsi/ufs/ufshcd.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)