scsi: ufs: Refactor cancelling clkscaling works

Cancelling suspend_work and resume_work is only required while suspending
clk-scaling. Move these two invocations into ufshcd_suspend_clkscaling()
function.

Link: https://lore.kernel.org/r/20210120150142.5049-2-stanley.chu@mediatek.com
Reviewed-by: Can Guo <cang@codeaurora.org>
Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 2c3c06bfd52b5f0c002a21f72cf0df105d57a15f..d6cd30ccf90803051fcc9182a87a71aca1f5b5aa 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -1503,6 +1503,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;
@@ -1564,9 +1567,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);
-
        hba->clk_scaling.is_enabled = value;
 
        if (value) {
@@ -5782,11 +5782,8 @@ static void ufshcd_err_handling_prepare(struct ufs_hba *hba)
                ufshcd_vops_resume(hba, pm_op);
        } 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;
                up_write(&hba->clk_scaling_lock);
@@ -8698,11 +8695,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);