[PATCH 7/7] ufs: core: Remove ufshcd_{hold,release}() calls from the I/O path

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

Patch "Switch from clock gating to RPM" makes it unnecessary to call
ufshcd_{hold,release}() from the I/O path. Hence, remove these calls.
Remove the code that sets host->queuecommand_may_block since this patch
removes all code that may block from the I/O path.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 drivers/ufs/core/ufshcd.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 8c388275308f..3cefbd69ab46 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -2892,16 +2892,12 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
 
 	hba->req_abort_count = 0;
 
-	ufshcd_hold(hba);
-
 	ufshcd_setup_scsi_cmd(hba, cmd,
 			      ufshcd_scsi_to_upiu_lun(cmd->device->lun), tag);
 
 	err = ufshcd_map_sg(hba, cmd);
-	if (err) {
-		ufshcd_release(hba);
+	if (err)
 		goto out;
-	}
 
 	if (hba->mcq_enabled)
 		hwq = ufshcd_mcq_req_to_hwq(hba, scsi_cmd_to_rq(cmd));
@@ -5403,7 +5399,6 @@ void ufshcd_release_scsi_cmd(struct ufs_hba *hba, struct scsi_cmnd *cmd)
 {
 	scsi_dma_unmap(cmd);
 	ufshcd_crypto_clear_prdt(hba, cmd);
-	ufshcd_release(hba);
 	ufshcd_clk_scaling_update_busy(hba);
 }
 
@@ -10676,7 +10671,6 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
 	host->max_channel = UFSHCD_MAX_CHANNEL;
 	host->unique_id = host->host_no;
 	host->max_cmd_len = UFS_CDB_SIZE;
-	host->queuecommand_may_block = !!(hba->caps & UFSHCD_CAP_CLK_GATING);
 
 	/* Use default RPM delay if host not set */
 	if (host->rpm_autosuspend_delay == 0)