Commit 59830c09 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: ufs: Remove the sdev_rpmb member 

Since the sdev_rpmb member of struct ufs_hba is only used inside
ufshcd_scsi_add_wlus(), convert it into a local variable.

Link: https://lore.kernel.org/r/20211203231950.193369-5-bvanassche@acm.org


Suggested-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
Tested-by: default avatarBean Huo <beanhuo@micron.com>
Reviewed-by: default avatarAsutosh Das <asutoshd@codeaurora.org>
Reviewed-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
Reviewed-by: default avatarBean Huo <beanhuo@micron.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d656dc9b

drivers/scsi/ufs/ufshcd.c

+6 −6
Original line number Diff line number Diff line
@@ -7412,7 +7412,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);
@@ -7423,14 +7423,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);

drivers/scsi/ufs/ufshcd.h

+0 −1
Original line number Diff line number Diff line
@@ -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;