Commit ade921a8 authored by Stanley Chu's avatar Stanley Chu Committed by Martin K. Petersen

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.comReviewed-by: default avatarAvri Altman <avri.altman@wdc.com>
Signed-off-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ca1bb061
...@@ -8189,16 +8189,10 @@ static int ufshcd_variant_hba_init(struct ufs_hba *hba) ...@@ -8189,16 +8189,10 @@ static int ufshcd_variant_hba_init(struct ufs_hba *hba)
goto out; goto out;
err = ufshcd_vops_init(hba); 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) if (err)
dev_err(hba->dev, "%s: variant %s init failed err %d\n", dev_err(hba->dev, "%s: variant %s init failed err %d\n",
__func__, ufshcd_get_var_name(hba), err); __func__, ufshcd_get_var_name(hba), err);
out:
return err; return err;
} }
...@@ -8207,8 +8201,6 @@ static void ufshcd_variant_hba_exit(struct ufs_hba *hba) ...@@ -8207,8 +8201,6 @@ static void ufshcd_variant_hba_exit(struct ufs_hba *hba)
if (!hba->vops) if (!hba->vops)
return; return;
ufshcd_vops_setup_regulators(hba, false);
ufshcd_vops_exit(hba); ufshcd_vops_exit(hba);
} }
......
...@@ -300,7 +300,6 @@ struct ufs_pwr_mode_info { ...@@ -300,7 +300,6 @@ struct ufs_pwr_mode_info {
* @get_ufs_hci_version: called to get UFS HCI version * @get_ufs_hci_version: called to get UFS HCI version
* @clk_scale_notify: notifies that clks are scaled up/down * @clk_scale_notify: notifies that clks are scaled up/down
* @setup_clocks: called before touching any of the controller registers * @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 * @hce_enable_notify: called before and after HCE enable bit is set to allow
* variant specific Uni-Pro initialization. * variant specific Uni-Pro initialization.
* @link_startup_notify: called before and after Link startup is carried out * @link_startup_notify: called before and after Link startup is carried out
...@@ -331,7 +330,6 @@ struct ufs_hba_variant_ops { ...@@ -331,7 +330,6 @@ struct ufs_hba_variant_ops {
enum ufs_notify_change_status); enum ufs_notify_change_status);
int (*setup_clocks)(struct ufs_hba *, bool, int (*setup_clocks)(struct ufs_hba *, bool,
enum ufs_notify_change_status); enum ufs_notify_change_status);
int (*setup_regulators)(struct ufs_hba *, bool);
int (*hce_enable_notify)(struct ufs_hba *, int (*hce_enable_notify)(struct ufs_hba *,
enum ufs_notify_change_status); enum ufs_notify_change_status);
int (*link_startup_notify)(struct ufs_hba *, int (*link_startup_notify)(struct ufs_hba *,
...@@ -1121,14 +1119,6 @@ static inline int ufshcd_vops_setup_clocks(struct ufs_hba *hba, bool on, ...@@ -1121,14 +1119,6 @@ static inline int ufshcd_vops_setup_clocks(struct ufs_hba *hba, bool on,
return 0; 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, static inline int ufshcd_vops_hce_enable_notify(struct ufs_hba *hba,
bool status) bool status)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment