phy: qcom-qmp-ufs: Remove qmp_ufs_com_init()

The qmp_ufs_power_on() function acts as a wrapper, solely invoking
qmp_ufs_com_init(). Additionally, the code within qmp_ufs_com_init()
does not correspond well with its name.

Therefore, to enhance the readability and eliminate unnecessary
function call inline qmp_ufs_com_init() into qmp_ufs_power_on().

There is no change to the functionality.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Nitin Rawat <quic_nitirawa@quicinc.com>
Link: https://lore.kernel.org/r/20250526153821.7918-7-quic_nitirawa@quicinc.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
index 33d238cf49aa2a399318eaa75659b4a352673ae9..eda0a59918ea5d0a975e636b24e91a225ea91da1 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
@@ -1758,9 +1758,23 @@ 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)
+static int qmp_ufs_com_exit(struct qmp_ufs *qmp)
 {
        const struct qmp_phy_cfg *cfg = qmp->cfg;
+
+       reset_control_assert(qmp->ufs_reset);
+
+       clk_bulk_disable_unprepare(qmp->num_clks, qmp->clks);
+
+       regulator_bulk_disable(cfg->num_vregs, qmp->vregs);
+
+       return 0;
+}
+
+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;
 
@@ -1775,35 +1789,10 @@ static int qmp_ufs_com_init(struct qmp_ufs *qmp)
                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)
-{
-       const struct qmp_phy_cfg *cfg = qmp->cfg;
-
-       reset_control_assert(qmp->ufs_reset);
-
-       clk_bulk_disable_unprepare(qmp->num_clks, qmp->clks);
-
-       regulator_bulk_disable(cfg->num_vregs, qmp->vregs);
-
-       return 0;
-}
-
-static int qmp_ufs_power_on(struct phy *phy)
-{
-       struct qmp_ufs *qmp = phy_get_drvdata(phy);
-       int ret;
-       dev_vdbg(qmp->dev, "Initializing QMP phy\n");
-
-       ret = qmp_ufs_com_init(qmp);
        return ret;
 }