phy: qcom-qmp-pcie: drop init and exit wrappers
authorJohan Hovold <johan+linaro@kernel.org>
Tue, 20 Sep 2022 07:38:14 +0000 (09:38 +0200)
committerVinod Koul <vkoul@kernel.org>
Sat, 24 Sep 2022 05:29:56 +0000 (10:59 +0530)
Drop the unnecessary PHY init and exit callback wrappers.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20220920073826.20811-6-johan+linaro@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c

index d25f9215b86f6565632439c6525d8d20a0a667db..525097e3b0416b68b364627cd3c370cef6a533ce 100644 (file)
@@ -1877,8 +1877,9 @@ static int qmp_pcie_serdes_init(struct qmp_phy *qphy)
        return 0;
 }
 
-static int qmp_pcie_com_init(struct qmp_phy *qphy)
+static int qmp_pcie_init(struct phy *phy)
 {
+       struct qmp_phy *qphy = phy_get_drvdata(phy);
        struct qcom_qmp *qmp = qphy->qmp;
        const struct qmp_phy_cfg *cfg = qphy->cfg;
        void __iomem *pcs = qphy->pcs;
@@ -1925,8 +1926,9 @@ err_disable_regulators:
        return ret;
 }
 
-static int qmp_pcie_com_exit(struct qmp_phy *qphy)
+static int qmp_pcie_exit(struct phy *phy)
 {
+       struct qmp_phy *qphy = phy_get_drvdata(phy);
        struct qcom_qmp *qmp = qphy->qmp;
        const struct qmp_phy_cfg *cfg = qphy->cfg;
 
@@ -1939,20 +1941,6 @@ static int qmp_pcie_com_exit(struct qmp_phy *qphy)
        return 0;
 }
 
-static int qmp_pcie_init(struct phy *phy)
-{
-       struct qmp_phy *qphy = phy_get_drvdata(phy);
-       struct qcom_qmp *qmp = qphy->qmp;
-       int ret;
-       dev_vdbg(qmp->dev, "Initializing QMP phy\n");
-
-       ret = qmp_pcie_com_init(qphy);
-       if (ret)
-               return ret;
-
-       return 0;
-}
-
 static int qmp_pcie_power_on(struct phy *phy)
 {
        struct qmp_phy *qphy = phy_get_drvdata(phy);
@@ -2060,15 +2048,6 @@ static int qmp_pcie_power_off(struct phy *phy)
        return 0;
 }
 
-static int qmp_pcie_exit(struct phy *phy)
-{
-       struct qmp_phy *qphy = phy_get_drvdata(phy);
-
-       qmp_pcie_com_exit(qphy);
-
-       return 0;
-}
-
 static int qmp_pcie_enable(struct phy *phy)
 {
        int ret;