Commit 046c1e6f authored by Bean Huo's avatar Bean Huo Committed by Martin K. Petersen
Browse files

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: default avatarAsutosh Das <asutoshd@codeaurora.org>
Signed-off-by: default avatarBean Huo <beanhuo@micron.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 8c9a51b0

drivers/scsi/ufs/ufshcd.c

+1 −4
Original line number Diff line number Diff line
@@ -6970,7 +6970,6 @@ static int ufshcd_add_lus(struct ufs_hba *hba) 
{

	int ret;



	if (!hba->is_init_prefetch)

	ufshcd_init_icc_levels(hba);



	/* Add required well known logical units to scsi mid layer */
@@ -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;

}

drivers/scsi/ufs/ufshcd.h

+0 −2
Original line number Diff line number Diff line
@@ -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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE