scsi: ufs: Cleanup phy_initialization vop
Subsystems (2)
cover scsi: ufs: Cleanup phy_initialization vop
Hi,
This series simply cleans up UFS vops and shall not change any functionality.
Stanley Chu (4):
scsi: ufs: Remove unused setup_regulators variant function
scsi: ufs: Introduce phy_initialization helper
scsi: ufs-cdns: Use phy_initialization helper
scsi: ufs-dwc: Use phy_initialization helper
drivers/scsi/ufs/cdns-pltfrm.c | 3 +-- drivers/scsi/ufs/ufshcd-dwc.c | 11 ++++------- drivers/scsi/ufs/ufshcd.c | 10 +--------- drivers/scsi/ufs/ufshcd.h | 18 ++++++++---------- 4 files changed, 14 insertions(+), 28 deletions(-)
Signature · 5 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH 1/4 scsi: ufs: Remove unused setup_regulators variant function
Since setup_regulators variant function is not used by any vendors, simply remove it.
--- drivers/scsi/ufs/ufshcd.c | 10 +--------- drivers/scsi/ufs/ufshcd.h | 10 ---------- 2 files changed, 1 insertion(+), 19 deletions(-)
drivers/scsi/ufs/ufshcd.c +1 -9
@@ -8171,16 +8171,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; }
@@ -8189,8 +8183,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); }
drivers/scsi/ufs/ufshcd.h +0 -10
@@ -277,7 +277,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
@@ -307,7 +306,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 *,
@@ -1119,14 +1117,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) {
Signature · 5 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH 2/4 scsi: ufs: Introduce phy_initialization helper
In reply to Stanley ChuIntroduce phy_initialization helper since this is the only one variant function without helper.
--- drivers/scsi/ufs/ufshcd.h | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/scsi/ufs/ufshcd.h +8 -0
@@ -1134,6 +1134,14 @@ static inline int ufshcd_vops_link_startup_notify(struct ufs_hba *hba,return 0 ; } +static inline int ufshcd_vops_phy_initialization (struct ufs_hba *hba) +{ +if (hba->vops && hba->vops->phy_initialization) +return hba->vops->phy_initialization (hba); + +return 0 ; +} + static inline int ufshcd_vops_pwr_change_notify(struct ufs_hba *hba, bool status, struct ufs_pa_layer_attr *dev_max_params,
Signature · 5 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH 3/4 scsi: ufs-cdns: Use phy_initialization helper
In reply to Stanley ChuUse phy_initialization helper instead of direct function invoking.
--- drivers/scsi/ufs/cdns-pltfrm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/ufs/cdns-pltfrm.c +1 -2
@@ -221,8 +221,7 @@ static int cdns_ufs_init(struct ufs_hba *hba)return -ENOMEM ;ufshcd_set_variant (hba, host); -if (hba->vops && hba->vops->phy_initialization) - status = hba->vops->phy_initialization (hba); + status =ufshcd_vops_phy_initialization (hba);return status; }
Signature · 5 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH 4/4 scsi: ufs-dwc: Use phy_initialization helper
In reply to Stanley ChuUse phy_initialization helper instead of direct invoking.
--- drivers/scsi/ufs/ufshcd-dwc.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/scsi/ufs/ufshcd-dwc.c +4 -7
@@ -120,13 +120,10 @@ int ufshcd_dwc_link_startup_notify(struct ufs_hba *hba,if (status ==PRE_CHANGE ) {ufshcd_dwc_program_clk_div (hba,DWC_UFS_REG_HCLKDIV_DIV_125 ); -if (hba->vops->phy_initialization) { - err = hba->vops->phy_initialization (hba); -if (err) { -dev_err (hba->dev,"Phy setup failed (%d)\n" , - err); - goto out; - } + err =ufshcd_vops_phy_initialization (hba); +if (err) { +dev_err (hba->dev,"Phy setup failed (%d)\n" , err); + goto out; } }else {/* POST_CHANGE */ err =ufshcd_dwc_link_is_up (hba);
Signature · 5 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Martin K. Petersen
AppliedStanley,
Quoted 2 lines
This series simply cleans up UFS vops and shall not change any functionality.
Applied to 5.11/scsi-staging, thanks!
Signature · 6 lines
Martin K. Petersen Oracle Linux Engineering _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Martin K. Petersen
AppliedQuoted 9 lines · Stanley Chu
This series simply cleans up UFS vops and shall not change any functionality.
Stanley Chu (4):
scsi: ufs: Remove unusedsetup_regulatorsvariant function
scsi: ufs: Introducephy_initializationhelper
scsi: ufs-cdns: Usephy_initializationhelper
scsi: ufs-dwc: Usephy_initializationhelper[...]
Applied to 5.11/scsi-queue, thanks!
[1/4] scsi: ufs: Remove unused setup_regulators variant function
https://git.kernel.org/mkp/scsi/c/ade921a891de [2/4] scsi: ufs: Introduce phy_initialization helper https://git.kernel.org/mkp/scsi/c/92bcebe4b6d6 [3/4] scsi: ufs-cdns: Use phy_initialization helper https://git.kernel.org/mkp/scsi/c/885445736bc0 [4/4] scsi: ufs-dwc: Use phy_initialization helper https://git.kernel.org/mkp/scsi/c/ab98105484fc
Signature · 6 lines
Martin K. Petersen Oracle Linux Engineering _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek