scsi: ufs: Remove unused setup_regulators variant function

Since setup_regulators variant function is not used by any vendors, simply
remove it.

Link: https://lore.kernel.org/r/20201205120041.26869-2-stanley.chu@mediatek.com
Reviewed-by: Avri Altman <avri.altman@wdc.com>
Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 308f624b3830ef838082edeea8697a355292a01d..6e72c0543c7b8d3ad0ea5fca184ac916f5772c63 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -8189,16 +8189,10 @@ static int ufshcd_variant_hba_init(struct ufs_hba *hba)
                goto out;
 
        err = ufshcd_vops_init(hba);
-       if (err)
-               goto out;
-
-       err = ufshcd_vops_setup_regulators(hba, true);
-       if (err)
-               ufshcd_vops_exit(hba);
-out:
        if (err)
                dev_err(hba->dev, "%s: variant %s init failed err %d\n",
                        __func__, ufshcd_get_var_name(hba), err);
+out:
        return err;
 }
 
@@ -8207,8 +8201,6 @@ static void ufshcd_variant_hba_exit(struct ufs_hba *hba)
        if (!hba->vops)
                return;
 
-       ufshcd_vops_setup_regulators(hba, false);
-
        ufshcd_vops_exit(hba);
 }
 

diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index 8159932398982033c78dcf109a545037c49c27f3..f92be8aea7a8182c7108a929f1363a62afc1b9ac 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -300,7 +300,6 @@ struct ufs_pwr_mode_info {
  * @get_ufs_hci_version: called to get UFS HCI version
  * @clk_scale_notify: notifies that clks are scaled up/down
  * @setup_clocks: called before touching any of the controller registers
- * @setup_regulators: called before accessing the host controller
  * @hce_enable_notify: called before and after HCE enable bit is set to allow
  *                     variant specific Uni-Pro initialization.
  * @link_startup_notify: called before and after Link startup is carried out
@@ -331,7 +330,6 @@ struct ufs_hba_variant_ops {
                                    enum ufs_notify_change_status);
        int     (*setup_clocks)(struct ufs_hba *, bool,
                                enum ufs_notify_change_status);
-       int     (*setup_regulators)(struct ufs_hba *, bool);
        int     (*hce_enable_notify)(struct ufs_hba *,
                                     enum ufs_notify_change_status);
        int     (*link_startup_notify)(struct ufs_hba *,
@@ -1121,14 +1119,6 @@ static inline int ufshcd_vops_setup_clocks(struct ufs_hba *hba, bool on,
        return 0;
 }
 
-static inline int ufshcd_vops_setup_regulators(struct ufs_hba *hba, bool status)
-{
-       if (hba->vops && hba->vops->setup_regulators)
-               return hba->vops->setup_regulators(hba, status);
-
-       return 0;
-}
-
 static inline int ufshcd_vops_hce_enable_notify(struct ufs_hba *hba,
                                                bool status)
 {