| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| From: Can Guo <cang@codeaurora.org> |
| Date: Wed, 30 Oct 2019 17:05:28 -0700 |
| Subject: FROMLIST: scsi: ufs: Remove the check before call setup clock notify |
| vops |
| |
| The functionality of vendor specific ops should be handled properly in |
| platform specific driver, but should not count on the UFS driver. |
| |
| Bug: 143632303 |
| Change-Id: Icad6554319f031b73c3ead28b74c38246ccc3fff |
| Link: https://lore.kernel.org/patchwork/patch/1149890/ |
| Signed-off-by: Can Guo <cang@codeaurora.org> |
| Signed-off-by: Asutosh Das <asutoshd@codeaurora.org> |
| --- |
| drivers/scsi/ufs/ufshcd.c | 26 ++++++-------------------- |
| 1 file changed, 6 insertions(+), 20 deletions(-) |
| |
| diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c |
| index 31b44579b015..068997255661 100644 |
| --- a/drivers/scsi/ufs/ufshcd.c |
| +++ b/drivers/scsi/ufs/ufshcd.c |
| @@ -7389,16 +7389,9 @@ static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on, |
| if (list_empty(head)) |
| goto out; |
| |
| - /* |
| - * vendor specific setup_clocks ops may depend on clocks managed by |
| - * 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) |
| - return ret; |
| - } |
| + 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)) { |
| @@ -7422,16 +7415,9 @@ static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on, |
| } |
| } |
| |
| - /* |
| - * vendor specific setup_clocks ops may depend on clocks managed by |
| - * 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) |
| - return ret; |
| - } |
| + ret = ufshcd_vops_setup_clocks(hba, on, POST_CHANGE); |
| + if (ret) |
| + return ret; |
| |
| out: |
| if (ret) { |