scsi: ufs: optimize clock gate work

In a case where gate work is called as part of cancel work from ungate
path the clk state would be marked as REQ_CLKS_ON.  There is no point
gating the clocks and then end up turning them ON immediately in ungate
work, save time by skipping the gate work and change the clk state to
CLKS_ON as they are not turned off yet.

Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
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 5ad4480afd011ac42eb5e50b5ddbe8f8204f31f5..304adce3bdbe00a8455b14f6c372c6f9c7295395 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -739,7 +739,14 @@ static void ufshcd_gate_work(struct work_struct *work)
        unsigned long flags;
 
        spin_lock_irqsave(hba->host->host_lock, flags);
-       if (hba->clk_gating.is_suspended) {
+       /*
+        * In case you are here to cancel this work the gating state
+        * would be marked as REQ_CLKS_ON. In this case save time by
+        * skipping the gating work and exit after changing the clock
+        * state to CLKS_ON.
+        */
+       if (hba->clk_gating.is_suspended ||
+               (hba->clk_gating.state == REQ_CLKS_ON)) {
                hba->clk_gating.state = CLKS_ON;
                goto rel_lock;
        }