scsi: ufs: Do not free irq in suspend

Since ufshcd irq resource is allocated with the device resource management
aware IRQ request implementation, we don't really need to free up irq
during suspend, disabling it during suspend and reenabling it during resume
should be good enough.

Link: https://lore.kernel.org/r/0101016ed3d69793-22918f99-23bf-495d-8a36-a9c108d1cbce-000000@us-west-2.amazonses.com
Reviewed-by: Stanley Chu <stanley.chu@mediatek.com>
Signed-off-by: Can Guo <cang@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 c1f92ee..e5cd57e 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -266,26 +266,18 @@ static inline bool ufshcd_valid_tag(struct ufs_hba *hba, int tag)
        return tag >= 0 && tag < hba->nutrs;
 }
 
-static inline int ufshcd_enable_irq(struct ufs_hba *hba)
+static inline void ufshcd_enable_irq(struct ufs_hba *hba)
 {
-       int ret = 0;
-
        if (!hba->is_irq_enabled) {
-               ret = request_irq(hba->irq, ufshcd_intr, IRQF_SHARED, UFSHCD,
-                               hba);
-               if (ret)
-                       dev_err(hba->dev, "%s: request_irq failed, ret=%d\n",
-                               __func__, ret);
+               enable_irq(hba->irq);
                hba->is_irq_enabled = true;
        }
-
-       return ret;
 }
 
 static inline void ufshcd_disable_irq(struct ufs_hba *hba)
 {
        if (hba->is_irq_enabled) {
-               free_irq(hba->irq, hba);
+               disable_irq(hba->irq);
                hba->is_irq_enabled = false;
        }
 }
@@ -7959,9 +7951,7 @@ static int ufshcd_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
                goto out;
 
        /* enable the host irq as host controller would be active soon */
-       ret = ufshcd_enable_irq(hba);
-       if (ret)
-               goto disable_irq_and_vops_clks;
+       ufshcd_enable_irq(hba);
 
        ret = ufshcd_vreg_set_hpm(hba);
        if (ret)