From aeed53d6a92ae6ddca3fe9cafa332f2348dc0536 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Wed, 26 May 2021 14:10:23 +0100 Subject: [PATCH] Revert "FROMLIST: scsi: ufs-qcom: enter and exit hibern8 during clock scaling" This reverts commit 8e57dcda431f60c845252fb1d3a2712b6c08be60. Failed upstream commit. Last attempt was over a year ago. Asutosh mentioned that they have no plans to continue with this in the near future. Suggested-by: Todd Kjos Signed-off-by: Lee Jones Change-Id: I6550947579c36e415271d1637e8bbc0ed6f11925 --- drivers/scsi/ufs/ufs-qcom.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c index da6e0e77e854..2a3dd21da6a6 100644 --- a/drivers/scsi/ufs/ufs-qcom.c +++ b/drivers/scsi/ufs/ufs-qcom.c @@ -1213,34 +1213,24 @@ static int ufs_qcom_clk_scale_notify(struct ufs_hba *hba, int err = 0; if (status == PRE_CHANGE) { - err = ufshcd_uic_hibern8_enter(hba); - if (err) - return err; if (scale_up) err = ufs_qcom_clk_scale_up_pre_change(hba); else err = ufs_qcom_clk_scale_down_pre_change(hba); - if (err) - ufshcd_uic_hibern8_exit(hba); - } else { if (scale_up) err = ufs_qcom_clk_scale_up_post_change(hba); else err = ufs_qcom_clk_scale_down_post_change(hba); - - if (err || !dev_req_params) { - ufshcd_uic_hibern8_exit(hba); + if (err || !dev_req_params) goto out; - } ufs_qcom_cfg_timers(hba, dev_req_params->gear_rx, dev_req_params->pwr_rx, dev_req_params->hs_rate, false); - ufshcd_uic_hibern8_exit(hba); } out: