Re: [PATCH V3 5/9] phy: qcom-qmp-ufs: Remove qmp_ufs_com_init()

Dmitry Baryshkov
2025-04-10T20:09:21Z

On Thu, Apr 10, 2025 at 02:30:58PM +0530, Nitin Rawat wrote:
> Simplify the qcom ufs phy driver by inlining qmp_ufs_com_init() into
> qmp_ufs_power_on(). This change removes unnecessary function calls and
> ensures that the initialization logic is directly within the power-on
> routine, maintaining the same functionality.

Which problem is this patch trying to solve?

>
> Signed-off-by: Nitin Rawat <quic_nitirawa@quicinc.com>
> ---
> drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 44 ++++++++++---------------
> 1 file changed, 18 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
> index 12dad28cc1bd..2cc819089d71 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
> @@ -1757,31 +1757,6 @@ static void qmp_ufs_init_registers(struct qmp_ufs *qmp, const struct qmp_phy_cfg
> qmp_ufs_init_all(qmp, &cfg->tbls_hs_b);
> }
>
> -static int qmp_ufs_com_init(struct qmp_ufs *qmp)
> -{
> - const struct qmp_phy_cfg *cfg = qmp->cfg;
> - void __iomem *pcs = qmp->pcs;
> - int ret;
> -
> - ret = regulator_bulk_enable(cfg->num_vregs, qmp->vregs);
> - if (ret) {
> - dev_err(qmp->dev, "failed to enable regulators, err=%d\n", ret);
> - return ret;
> - }
> -
> - ret = clk_bulk_prepare_enable(qmp->num_clks, qmp->clks);
> - if (ret)
> - goto err_disable_regulators;
> -
> - qphy_setbits(pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL], SW_PWRDN);
> -
> - return 0;
> -
> -err_disable_regulators:
> - regulator_bulk_disable(cfg->num_vregs, qmp->vregs);
> -
> - return ret;
> -}
>
> static int qmp_ufs_com_exit(struct qmp_ufs *qmp)
> {
> @@ -1799,10 +1774,27 @@ static int qmp_ufs_com_exit(struct qmp_ufs *qmp)
> static int qmp_ufs_power_on(struct phy *phy)
> {
> struct qmp_ufs *qmp = phy_get_drvdata(phy);
> + const struct qmp_phy_cfg *cfg = qmp->cfg;
> + void __iomem *pcs = qmp->pcs;
> int ret;
> +
> dev_vdbg(qmp->dev, "Initializing QMP phy\n");
>
> - ret = qmp_ufs_com_init(qmp);
> + ret = regulator_bulk_enable(cfg->num_vregs, qmp->vregs);
> + if (ret) {
> + dev_err(qmp->dev, "failed to enable regulators, err=%d\n", ret);
> + return ret;
> + }
> +
> + ret = clk_bulk_prepare_enable(qmp->num_clks, qmp->clks);
> + if (ret)
> + goto err_disable_regulators;
> +
> + qphy_setbits(pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL], SW_PWRDN);
> + return 0;
> +
> +err_disable_regulators:
> + regulator_bulk_disable(cfg->num_vregs, qmp->vregs);
> return ret;
> }
>
> --
> 2.48.1
>

--
With best wishes
Dmitry