scsi: ufs: Remove ufshcd_variant_hba_init/exit()
A message that is not in the archive (sent off-list or not yet received): CGME20210806083344epcms2p1fd38026d07cd74438b4aa2bbd95c3f20@epcms2p1
PATCH 1/1 scsi: ufs: Remove ufshcd_variant_hba_init/exit()
Since hba->vops is checked in ufshcd_vops_init/exit(), there is no need to check whether hba->vops is NULL in ufshcd_variant_hba_init/exit().
ufshcd_variant_hba_init/exit() has only one caller and only calls vops, so it was removed.
Signed-off-by Keoseong Park <[email protected]>
--- drivers/scsi/ufs/ufshcd.c | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-)
drivers/scsi/ufs/ufshcd.c +6 -26
@@ -8438,29 +8438,6 @@ static int ufshcd_init_clocks(struct ufs_hba *hba)return ret; } -static int ufshcd_variant_hba_init (struct ufs_hba *hba) -{ -int err =0 ; - -if (!hba->vops) - goto out; - - err =ufshcd_vops_init (hba); -if (err) -dev_err (hba->dev,"%s: variant %s init failed err %d\n" , - __func__,ufshcd_get_var_name (hba), err); -out: -return err; -} - -static void ufshcd_variant_hba_exit (struct ufs_hba *hba) -{ -if (!hba->vops) -return ; - -ufshcd_vops_exit (hba); -} -static int ufshcd_hba_init (struct ufs_hba *hba) {int err;
@@ -8496,9 +8473,12 @@ static int ufshcd_hba_init(struct ufs_hba *hba)if (err) goto out_disable_clks; - err =ufshcd_variant_hba_init (hba); -if (err) + err =ufshcd_vops_init (hba); +if (err) { +dev_err (hba->dev,"%s: variant %s init failed err %d\n" , + __func__,ufshcd_get_var_name (hba), err); goto out_disable_vreg; + }ufs_debugfs_hba_init (hba);
@@ -8523,7 +8503,7 @@ static void ufshcd_hba_exit(struct ufs_hba *hba)if (hba->eh_wq)destroy_workqueue (hba->eh_wq);ufs_debugfs_hba_exit (hba); -ufshcd_variant_hba_exit (hba); +ufshcd_vops_exit (hba);ufshcd_setup_vreg (hba, false);ufshcd_setup_clocks (hba, false);ufshcd_setup_hba_vreg (hba, false);
Signature · 1 line
2.17.1