scsi: ufs: Delete is_init_prefetch from struct ufs_hba

Without variable is_init_prefetch, the current logic can guarantee
ufshcd_init_icc_levels() will execute only once, delete it now.

Link: https://lore.kernel.org/r/20200120130820.1737-7-huobean@gmail.com
Reviewed-by: Asutosh Das <asutoshd@codeaurora.org>
Signed-off-by: Bean Huo <beanhuo@micron.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 ba83eda..80e2261 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -6970,8 +6970,7 @@ static int ufshcd_add_lus(struct ufs_hba *hba)
 {
        int ret;
 
-       if (!hba->is_init_prefetch)
-               ufshcd_init_icc_levels(hba);
+       ufshcd_init_icc_levels(hba);
 
        /* Add required well known logical units to scsi mid layer */
        ret = ufshcd_scsi_add_wlus(hba);
@@ -6997,8 +6996,6 @@ static int ufshcd_add_lus(struct ufs_hba *hba)
        scsi_scan_host(hba->host);
        pm_runtime_put_sync(hba->dev);
 
-       if (!hba->is_init_prefetch)
-               hba->is_init_prefetch = true;
 out:
        return ret;
 }

diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index 961d673..2ae6c7c 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -501,7 +501,6 @@ struct ufs_stats {
  * @intr_mask: Interrupt Mask Bits
  * @ee_ctrl_mask: Exception event control mask
  * @is_powered: flag to check if HBA is powered
- * @is_init_prefetch: flag to check if data was pre-fetched in initialization
  * @init_prefetch_data: data pre-fetched during initialization
  * @eh_work: Worker to handle UFS errors that require s/w attention
  * @eeh_work: Worker to handle exception events
@@ -652,7 +651,6 @@ struct ufs_hba {
        u32 intr_mask;
        u16 ee_ctrl_mask;
        bool is_powered;
-       bool is_init_prefetch;
        struct ufs_init_prefetch init_prefetch_data;
 
        /* Work Queues */