| Message ID | 20200120130820.1737-7-huobean@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Use UFS device indicated maximum LU number | expand |
On 1/20/2020 5:08 AM, Bean Huo wrote: > From: Bean Huo <beanhuo@micron.com> > > Without variable is_init_prefetch, the current logic can guarantee > ufshcd_init_icc_levels() will execute only once, delete it now. > > Signed-off-by: Bean Huo <beanhuo@micron.com> > --- Reviewed-by: Asutosh Das <asutoshd@codeaurora.org> > drivers/scsi/ufs/ufshcd.c | 5 +---- > drivers/scsi/ufs/ufshcd.h | 2 -- > 2 files changed, 1 insertion(+), 6 deletions(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index 3d3289bb3cad..0c859f239d1c 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -6967,8 +6967,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); > @@ -6994,8 +6993,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 32b6714f25a5..5c65d9fdeb14 100644 > --- 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 */ >
On 2020-01-20 05:08, Bean Huo wrote: > Without variable is_init_prefetch, the current logic can guarantee > ufshcd_init_icc_levels() will execute only once, delete it now. How about changing this description into the following: A previous patch in this series introduced ufshcd_add_lus(). That function is called once per HBA which makes the is_init_prefetch member superfluous. Hence remove the is_init_prefetch member. Anyway: Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Hi, Bart > > On 2020-01-20 05:08, Bean Huo wrote: > > Without variable is_init_prefetch, the current logic can guarantee > > ufshcd_init_icc_levels() will execute only once, delete it now. > > How about changing this description into the following: > > A previous patch in this series introduced ufshcd_add_lus(). That function is > called once per HBA which makes the is_init_prefetch member superfluous. > Hence remove the is_init_prefetch member. > > Anyway: > > Reviewed-by: Bart Van Assche <bvanassche@acm.org> Vielen Dank. Yes, I agree your commit message is better than mine. but they have the same final meaning. And I see Martin has mainlined my patches, if he need my next one, I will change to your description. Thanks, //Bean
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 3d3289bb3cad..0c859f239d1c 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -6967,8 +6967,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); @@ -6994,8 +6993,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 32b6714f25a5..5c65d9fdeb14 100644 --- 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 */