From 3595f454918c10aea1c9aea0a81d78a860000533 Mon Sep 17 00:00:00 2001 From: Asutosh Das Date: Wed, 19 Feb 2020 13:47:57 -0800 Subject: [PATCH] scsi: ufshcd-qti: Always allow vendor to configure clocks Allow vendor configuration on prechange and post-change change while setting up clocks. Change-Id: I90c7657f1ccfd1beed97779d2c7a3a85173fd176 Signed-off-by: Asutosh Das --- drivers/scsi/ufs/ufshcd-qti.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd-qti.c b/drivers/scsi/ufs/ufshcd-qti.c index 2405844354d7..f50ed83ff723 100644 --- a/drivers/scsi/ufs/ufshcd-qti.c +++ b/drivers/scsi/ufs/ufshcd-qti.c @@ -8703,11 +8703,9 @@ static int ufshcd_setup_clocks(struct ufs_hba *hba, bool on, * this standard driver hence call the vendor specific setup_clocks * before disabling the clocks managed here. */ - if (!on) { - ret = ufshcd_vops_setup_clocks(hba, on, PRE_CHANGE); - if (ret) - goto out_unlock; - } + ret = ufshcd_vops_setup_clocks(hba, on, PRE_CHANGE); + if (ret) + return ret; list_for_each_entry(clki, head, list) { if (!IS_ERR_OR_NULL(clki->clk)) { @@ -8742,11 +8740,7 @@ static int ufshcd_setup_clocks(struct ufs_hba *hba, bool on, * this standard driver hence call the vendor specific setup_clocks * after enabling the clocks managed here. */ - if (on) { - ret = ufshcd_vops_setup_clocks(hba, on, POST_CHANGE); - if (ret) - goto out; - } + ret = ufshcd_vops_setup_clocks(hba, on, POST_CHANGE); out: if (ret) { @@ -8766,7 +8760,6 @@ out: trace_ufshcd_profile_clk_gating(dev_name(hba->dev), (on ? "on" : "off"), ktime_to_us(ktime_sub(ktime_get(), start)), ret); -out_unlock: return ret; }