scsi: ufs: Remove unnecessary if condition in ufshcd_suspend()
authorBean Huo <beanhuo@micron.com>
Wed, 25 Nov 2020 18:53:00 +0000 (19:53 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 1 Dec 2020 04:44:29 +0000 (23:44 -0500)
In the case that auto_bkops_enable is false, which means auto bkops has
been disabled, there is no need to call ufshcd_disable_auto_bkops().

Link: https://lore.kernel.org/r/20201125185300.3394-1-huobean@gmail.com
Reviewed-by: Stanley Chu <stanley.chu@mediatek.com>
Reviewed-by: Can Guo <cang@codeaurora.org>
Signed-off-by: Bean Huo <beanhuo@micron.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/ufs/ufshcd.c

index 92d433d5f3caa82bb8ce5e536702158438c335a7..93e15e829d1deaeb73be0006931b77ba5486b9d2 100644 (file)
@@ -8609,11 +8609,9 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
        }
 
        if (req_dev_pwr_mode != hba->curr_dev_pwr_mode) {
-               if ((ufshcd_is_runtime_pm(pm_op) && !hba->auto_bkops_enabled) ||
-                   !ufshcd_is_runtime_pm(pm_op)) {
+               if (!ufshcd_is_runtime_pm(pm_op))
                        /* ensure that bkops is disabled */
                        ufshcd_disable_auto_bkops(hba);
-               }
 
                if (!hba->dev_info.b_rpm_dev_flush_capable) {
                        ret = ufshcd_set_dev_pwr_mode(hba, req_dev_pwr_mode);