| Message ID | 20211110004440.3389311-4-bvanassche@acm.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | UFS patches for kernel v5.17 | expand |
On 11/9/2021 4:44 PM, Bart Van Assche wrote: > Since the sdev_rpmb member of struct ufs_hba is only used inside > ufshcd_scsi_add_wlus(), convert it into a local variable. > > Suggested-by: Jaegeuk Kim <jaegeuk@kernel.org> > Signed-off-by: Bart Van Assche <bvanassche@acm.org> > --- Reviewed-by: Asutosh Das <asutoshd@codeaurora.org> > drivers/scsi/ufs/ufshcd.c | 12 ++++++------ > drivers/scsi/ufs/ufshcd.h | 1 - > 2 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index d18685d080d7..dff76b1a0d5d 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -7407,7 +7407,7 @@ static inline void ufshcd_blk_pm_runtime_init(struct scsi_device *sdev) > static int ufshcd_scsi_add_wlus(struct ufs_hba *hba) > { > int ret = 0; > - struct scsi_device *sdev_boot; > + struct scsi_device *sdev_boot, *sdev_rpmb; > > hba->sdev_ufs_device = __scsi_add_device(hba->host, 0, 0, > ufshcd_upiu_wlun_to_scsi_wlun(UFS_UPIU_UFS_DEVICE_WLUN), NULL); > @@ -7418,14 +7418,14 @@ static int ufshcd_scsi_add_wlus(struct ufs_hba *hba) > } > scsi_device_put(hba->sdev_ufs_device); > > - hba->sdev_rpmb = __scsi_add_device(hba->host, 0, 0, > + sdev_rpmb = __scsi_add_device(hba->host, 0, 0, > ufshcd_upiu_wlun_to_scsi_wlun(UFS_UPIU_RPMB_WLUN), NULL); > - if (IS_ERR(hba->sdev_rpmb)) { > - ret = PTR_ERR(hba->sdev_rpmb); > + if (IS_ERR(sdev_rpmb)) { > + ret = PTR_ERR(sdev_rpmb); > goto remove_sdev_ufs_device; > } > - ufshcd_blk_pm_runtime_init(hba->sdev_rpmb); > - scsi_device_put(hba->sdev_rpmb); > + ufshcd_blk_pm_runtime_init(sdev_rpmb); > + scsi_device_put(sdev_rpmb); > > sdev_boot = __scsi_add_device(hba->host, 0, 0, > ufshcd_upiu_wlun_to_scsi_wlun(UFS_UPIU_BOOT_WLUN), NULL); > diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h > index a911ad72de7a..65178487adf3 100644 > --- a/drivers/scsi/ufs/ufshcd.h > +++ b/drivers/scsi/ufs/ufshcd.h > @@ -809,7 +809,6 @@ struct ufs_hba { > * "UFS device" W-LU. > */ > struct scsi_device *sdev_ufs_device; > - struct scsi_device *sdev_rpmb; > > #ifdef CONFIG_SCSI_UFS_HWMON > struct device *hwmon_device; >
Hi Bart On Wed, Nov 10, 2021 at 6:21 AM Bart Van Assche <bvanassche@acm.org> wrote: > > Since the sdev_rpmb member of struct ufs_hba is only used inside > ufshcd_scsi_add_wlus(), convert it into a local variable. > > Suggested-by: Jaegeuk Kim <jaegeuk@kernel.org> > Signed-off-by: Bart Van Assche <bvanassche@acm.org> > --- Thanks Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com> > drivers/scsi/ufs/ufshcd.c | 12 ++++++------ > drivers/scsi/ufs/ufshcd.h | 1 - > 2 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index d18685d080d7..dff76b1a0d5d 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -7407,7 +7407,7 @@ static inline void ufshcd_blk_pm_runtime_init(struct scsi_device *sdev) > static int ufshcd_scsi_add_wlus(struct ufs_hba *hba) > { > int ret = 0; > - struct scsi_device *sdev_boot; > + struct scsi_device *sdev_boot, *sdev_rpmb; > > hba->sdev_ufs_device = __scsi_add_device(hba->host, 0, 0, > ufshcd_upiu_wlun_to_scsi_wlun(UFS_UPIU_UFS_DEVICE_WLUN), NULL); > @@ -7418,14 +7418,14 @@ static int ufshcd_scsi_add_wlus(struct ufs_hba *hba) > } > scsi_device_put(hba->sdev_ufs_device); > > - hba->sdev_rpmb = __scsi_add_device(hba->host, 0, 0, > + sdev_rpmb = __scsi_add_device(hba->host, 0, 0, > ufshcd_upiu_wlun_to_scsi_wlun(UFS_UPIU_RPMB_WLUN), NULL); > - if (IS_ERR(hba->sdev_rpmb)) { > - ret = PTR_ERR(hba->sdev_rpmb); > + if (IS_ERR(sdev_rpmb)) { > + ret = PTR_ERR(sdev_rpmb); > goto remove_sdev_ufs_device; > } > - ufshcd_blk_pm_runtime_init(hba->sdev_rpmb); > - scsi_device_put(hba->sdev_rpmb); > + ufshcd_blk_pm_runtime_init(sdev_rpmb); > + scsi_device_put(sdev_rpmb); > > sdev_boot = __scsi_add_device(hba->host, 0, 0, > ufshcd_upiu_wlun_to_scsi_wlun(UFS_UPIU_BOOT_WLUN), NULL); > diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h > index a911ad72de7a..65178487adf3 100644 > --- a/drivers/scsi/ufs/ufshcd.h > +++ b/drivers/scsi/ufs/ufshcd.h > @@ -809,7 +809,6 @@ struct ufs_hba { > * "UFS device" W-LU. > */ > struct scsi_device *sdev_ufs_device; > - struct scsi_device *sdev_rpmb; > > #ifdef CONFIG_SCSI_UFS_HWMON > struct device *hwmon_device;
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index d18685d080d7..dff76b1a0d5d 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -7407,7 +7407,7 @@ static inline void ufshcd_blk_pm_runtime_init(struct scsi_device *sdev) static int ufshcd_scsi_add_wlus(struct ufs_hba *hba) { int ret = 0; - struct scsi_device *sdev_boot; + struct scsi_device *sdev_boot, *sdev_rpmb; hba->sdev_ufs_device = __scsi_add_device(hba->host, 0, 0, ufshcd_upiu_wlun_to_scsi_wlun(UFS_UPIU_UFS_DEVICE_WLUN), NULL); @@ -7418,14 +7418,14 @@ static int ufshcd_scsi_add_wlus(struct ufs_hba *hba) } scsi_device_put(hba->sdev_ufs_device); - hba->sdev_rpmb = __scsi_add_device(hba->host, 0, 0, + sdev_rpmb = __scsi_add_device(hba->host, 0, 0, ufshcd_upiu_wlun_to_scsi_wlun(UFS_UPIU_RPMB_WLUN), NULL); - if (IS_ERR(hba->sdev_rpmb)) { - ret = PTR_ERR(hba->sdev_rpmb); + if (IS_ERR(sdev_rpmb)) { + ret = PTR_ERR(sdev_rpmb); goto remove_sdev_ufs_device; } - ufshcd_blk_pm_runtime_init(hba->sdev_rpmb); - scsi_device_put(hba->sdev_rpmb); + ufshcd_blk_pm_runtime_init(sdev_rpmb); + scsi_device_put(sdev_rpmb); sdev_boot = __scsi_add_device(hba->host, 0, 0, ufshcd_upiu_wlun_to_scsi_wlun(UFS_UPIU_BOOT_WLUN), NULL); diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index a911ad72de7a..65178487adf3 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -809,7 +809,6 @@ struct ufs_hba { * "UFS device" W-LU. */ struct scsi_device *sdev_ufs_device; - struct scsi_device *sdev_rpmb; #ifdef CONFIG_SCSI_UFS_HWMON struct device *hwmon_device;
Since the sdev_rpmb member of struct ufs_hba is only used inside ufshcd_scsi_add_wlus(), convert it into a local variable. Suggested-by: Jaegeuk Kim <jaegeuk@kernel.org> Signed-off-by: Bart Van Assche <bvanassche@acm.org> --- drivers/scsi/ufs/ufshcd.c | 12 ++++++------ drivers/scsi/ufs/ufshcd.h | 1 - 2 files changed, 6 insertions(+), 7 deletions(-)