diff mbox series

[v3,1/3] scsi: ufs: core: Remove unnecessary if statement

Message ID 20221018181627.326657-2-beanhuo@iokpp.de (mailing list archive)
State Superseded
Headers show
Series Changes for ufshcd.c | expand

Commit Message

Bean Huo Oct. 18, 2022, 6:16 p.m. UTC 
From: Bean Huo <beanhuo@micron.com>

LUs with WB potential support are properly checked in ufshcd_wb_probe()
before calling ufshcd_read_unit_desc_param(), so remove this unnecessary
if-checkup in ufs_is_valid_unit_desc_lun() to match its function definition.

Signed-off-by: Bean Huo <beanhuo@micron.com>
---
 drivers/ufs/core/ufs-sysfs.c   | 3 +--
 drivers/ufs/core/ufshcd-priv.h | 6 +-----
 drivers/ufs/core/ufshcd.c      | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

Comments

Bart Van Assche Oct. 18, 2022, 6:20 p.m. UTC | #1 
On 10/18/22 11:16, Bean Huo wrote:
> From: Bean Huo <beanhuo@micron.com>
> 
> LUs with WB potential support are properly checked in ufshcd_wb_probe()
> before calling ufshcd_read_unit_desc_param(), so remove this unnecessary
> if-checkup in ufs_is_valid_unit_desc_lun() to match its function definition.

Hi Bean,

Does this patch differ from a revert of Jaegeuk's patch? If not, please 
change the patch title into "Revert scsi: ufs: WB is only available on 
LUN #0 to #7" and add "Cc: Jaegeuk Kim <jaegeuk@kernel.org>" just above 
the Signed-off-by line.

Thanks,

Bart.
Bean Huo Oct. 18, 2022, 6:23 p.m. UTC | #2 
On Tue, 2022-10-18 at 11:20 -0700, Bart Van Assche wrote:
> On 10/18/22 11:16, Bean Huo wrote:
> > From: Bean Huo <beanhuo@micron.com>
> > 
> > LUs with WB potential support are properly checked in
> > ufshcd_wb_probe()
> > before calling ufshcd_read_unit_desc_param(), so remove this
> > unnecessary
> > if-checkup in ufs_is_valid_unit_desc_lun() to match its function
> > definition.
> 
> Hi Bean,
> 
> Does this patch differ from a revert of Jaegeuk's patch? If not,
> please 
> change the patch title into "Revert scsi: ufs: WB is only available
> on 
> LUN #0 to #7" and add "Cc: Jaegeuk Kim <jaegeuk@kernel.org>" just
> above 
> the Signed-off-by line.
> 
> Thanks,
> 
> Bart.

Bart, 

no difference, I will change its title and CC Jaegeuk.

thanks,
Bean
diff mbox series

Patch

diff --git a/drivers/ufs/core/ufs-sysfs.c b/drivers/ufs/core/ufs-sysfs.c
index 53aea56d1de1..eb6b278c4e79 100644
--- a/drivers/ufs/core/ufs-sysfs.c
+++ b/drivers/ufs/core/ufs-sysfs.c
@@ -1234,8 +1234,7 @@  static ssize_t _pname##_show(struct device *dev,			\
 	struct scsi_device *sdev = to_scsi_device(dev);			\
 	struct ufs_hba *hba = shost_priv(sdev->host);			\
 	u8 lun = ufshcd_scsi_to_upiu_lun(sdev->lun);			\
-	if (!ufs_is_valid_unit_desc_lun(&hba->dev_info, lun,		\
-				_duname##_DESC_PARAM##_puname))		\
+	if (!ufs_is_valid_unit_desc_lun(&hba->dev_info, lun))		\
 		return -EINVAL;						\
 	return ufs_sysfs_read_desc_param(hba, QUERY_DESC_IDN_##_duname,	\
 		lun, _duname##_DESC_PARAM##_puname, buf, _size);	\
diff --git a/drivers/ufs/core/ufshcd-priv.h b/drivers/ufs/core/ufshcd-priv.h
index f68ca33f6ac7..a9e8e1f5afe7 100644
--- a/drivers/ufs/core/ufshcd-priv.h
+++ b/drivers/ufs/core/ufshcd-priv.h
@@ -293,16 +293,12 @@  static inline int ufshcd_rpm_put(struct ufs_hba *hba)
  * @lun: LU number to check
  * @return: true if the lun has a matching unit descriptor, false otherwise
  */
-static inline bool ufs_is_valid_unit_desc_lun(struct ufs_dev_info *dev_info,
-		u8 lun, u8 param_offset)
+static inline bool ufs_is_valid_unit_desc_lun(struct ufs_dev_info *dev_info, u8 lun)
 {
 	if (!dev_info || !dev_info->max_lu_supported) {
 		pr_err("Max General LU supported by UFS isn't initialized\n");
 		return false;
 	}
-	/* WB is available only for the logical unit from 0 to 7 */
-	if (param_offset == UNIT_DESC_PARAM_WB_BUF_ALLOC_UNITS)
-		return lun < UFS_UPIU_MAX_WB_LUN_ID;
 	return lun == UFS_UPIU_RPMB_WLUN || (lun < dev_info->max_lu_supported);
 }
 
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 7c15cbc737b4..85679e8a043b 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -3609,7 +3609,7 @@  static inline int ufshcd_read_unit_desc_param(struct ufs_hba *hba,
 	 * Unit descriptors are only available for general purpose LUs (LUN id
 	 * from 0 to 7) and RPMB Well known LU.
 	 */
-	if (!ufs_is_valid_unit_desc_lun(&hba->dev_info, lun, param_offset))
+	if (!ufs_is_valid_unit_desc_lun(&hba->dev_info, lun))
 		return -EOPNOTSUPP;
 
 	return ufshcd_read_desc_param(hba, QUERY_DESC_IDN_UNIT, lun,