scsi: ufs: Remove the check before call setup clock notify vops
authorCan Guo <cang@codeaurora.org>
Tue, 11 Feb 2020 03:40:47 +0000 (19:40 -0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Thu, 13 Feb 2020 00:42:36 +0000 (19:42 -0500)
The functionality of vendor specific ops should be handled properly in
platform specific driver, but should not count on the UFS driver.

Link: https://lore.kernel.org/r/1581392451-28743-5-git-send-email-cang@codeaurora.org
Reviewed-by: Bean Huo <beanhuo@micron.com>
Reviewed-by: Stanley Chu <stanley.chu@mediatek.com>
Signed-off-by: Can Guo <cang@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/ufs/ufshcd.c

index 9c39fae..661ba37 100644 (file)
@@ -7403,16 +7403,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)) {
@@ -7436,16 +7429,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) {