scsi: ufs: Remove redundant urgent_bkop_lvl initialization
authorStanley Chu <stanley.chu@mediatek.com>
Sat, 30 May 2020 14:12:00 +0000 (22:12 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 3 Jun 2020 01:44:53 +0000 (21:44 -0400)
In ufshcd_probe_hba(), all BKOP SW tracking variables can be reset together
in ufshcd_force_reset_auto_bkops(), thus urgent_bkop_lvl initialization in
the beginning of ufshcd_probe_hba() can be merged into
ufshcd_force_reset_auto_bkops().

Link: https://lore.kernel.org/r/20200530141200.4616-1-stanley.chu@mediatek.com
Reviewed-by: Avri Altman <avri.altman@wdc.com>
Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/ufs/ufshcd.c

index 2bdee9e..ad4fc82 100644 (file)
@@ -5076,6 +5076,7 @@ static void ufshcd_force_reset_auto_bkops(struct ufs_hba *hba)
                hba->ee_ctrl_mask &= ~MASK_EE_URGENT_BKOPS;
                ufshcd_disable_auto_bkops(hba);
        }
+       hba->urgent_bkops_lvl = BKOPS_STATUS_PERF_IMPACT;
        hba->is_urgent_bkops_lvl_checked = false;
 }
 
@@ -7372,10 +7373,6 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool async)
        if (ret)
                goto out;
 
-       /* set the default level for urgent bkops */
-       hba->urgent_bkops_lvl = BKOPS_STATUS_PERF_IMPACT;
-       hba->is_urgent_bkops_lvl_checked = false;
-
        /* Debug counters initialization */
        ufshcd_clear_dbg_ufs_stats(hba);