[PATCH 6/7] ufs: core: Remove superfluous ufshcd_{hold,release}() calls

[Bart Van Assche <bvanassche@acm.org>]

ufshcd_hold() and ufshcd_release() have been modified such that these
call runtime power management functions on the WLUN. Hence,
ufshcd_hold() calls that follow a ufshcd_rpm_get_sync() call and also
ufshcd_release() calls that precede ufshcd_rpm_put_sync() can be left
out.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 drivers/ufs/core/ufs-sysfs.c | 2 --
 drivers/ufs/core/ufshcd.c    | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/drivers/ufs/core/ufs-sysfs.c b/drivers/ufs/core/ufs-sysfs.c
index b33f8656edb5..2cc7f5063286 100644
--- a/drivers/ufs/core/ufs-sysfs.c
+++ b/drivers/ufs/core/ufs-sysfs.c
@@ -256,9 +256,7 @@ static int ufshcd_read_hci_reg(struct ufs_hba *hba, u32 *val, unsigned int reg)
 	}
 
 	ufshcd_rpm_get_sync(hba);
-	ufshcd_hold(hba);
 	*val = ufshcd_readl(hba, reg);
-	ufshcd_release(hba);
 	ufshcd_rpm_put_sync(hba);
 
 	up(&hba->host_sem);
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 1189a9fd39ff..8c388275308f 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -1809,7 +1809,6 @@ static ssize_t ufshcd_clkscale_enable_store(struct device *dev,
 		goto out;
 
 	ufshcd_rpm_get_sync(hba);
-	ufshcd_hold(hba);
 
 	hba->clk_scaling.is_enabled = value;
 
@@ -1834,7 +1833,6 @@ static ssize_t ufshcd_clkscale_enable_store(struct device *dev,
 		hba->clk_scaling.target_freq = freq;
 
 out_rel:
-	ufshcd_release(hba);
 	ufshcd_rpm_put_sync(hba);
 out:
 	up(&hba->host_sem);
@@ -4368,9 +4366,7 @@ void ufshcd_auto_hibern8_update(struct ufs_hba *hba, u32 ahit)
 	WRITE_ONCE(hba->ahit, ahit);
 	if (!pm_runtime_suspended(&hba->ufs_device_wlun->sdev_gendev)) {
 		ufshcd_rpm_get_sync(hba);
-		ufshcd_hold(hba);
 		ufshcd_configure_auto_hibern8(hba);
-		ufshcd_release(hba);
 		ufshcd_rpm_put_sync(hba);
 	}
 }