phy: qcom-qmp-combo: rename PHY ops structures

Rename the PHY operation structures so that they have a "phy_ops" suffix
and move them next to the implementation.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20221114110621.4639-5-johan+linaro@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
index 2ac29b71d3b729a8253f5a5c383ba3e74289c19c..13800c2243e11e7ef2ed3be05a0e7863c9083132 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
@@ -2118,6 +2118,24 @@ static int qmp_combo_set_mode(struct phy *phy, enum phy_mode mode, int submode)
        return 0;
 }
 
+static const struct phy_ops qmp_combo_usb_phy_ops = {
+       .init           = qmp_combo_enable,
+       .exit           = qmp_combo_disable,
+       .set_mode       = qmp_combo_set_mode,
+       .owner          = THIS_MODULE,
+};
+
+static const struct phy_ops qmp_combo_dp_phy_ops = {
+       .init           = qmp_combo_init,
+       .configure      = qcom_qmp_dp_phy_configure,
+       .power_on       = qmp_combo_power_on,
+       .calibrate      = qcom_qmp_dp_phy_calibrate,
+       .power_off      = qmp_combo_power_off,
+       .exit           = qmp_combo_exit,
+       .set_mode       = qmp_combo_set_mode,
+       .owner          = THIS_MODULE,
+};
+
 static void qmp_combo_enable_autonomous_mode(struct qmp_phy *qphy)
 {
        const struct qmp_phy_cfg *cfg = qphy->cfg;
@@ -2542,24 +2560,6 @@ static int phy_dp_clks_register(struct qcom_qmp *qmp, struct qmp_phy *qphy,
        return devm_add_action_or_reset(qmp->dev, phy_clk_release_provider, np);
 }
 
-static const struct phy_ops qmp_combo_usb_ops = {
-       .init           = qmp_combo_enable,
-       .exit           = qmp_combo_disable,
-       .set_mode       = qmp_combo_set_mode,
-       .owner          = THIS_MODULE,
-};
-
-static const struct phy_ops qmp_combo_dp_ops = {
-       .init           = qmp_combo_init,
-       .configure      = qcom_qmp_dp_phy_configure,
-       .power_on       = qmp_combo_power_on,
-       .calibrate      = qcom_qmp_dp_phy_calibrate,
-       .power_off      = qmp_combo_power_off,
-       .exit           = qmp_combo_exit,
-       .set_mode       = qmp_combo_set_mode,
-       .owner          = THIS_MODULE,
-};
-
 static int qmp_combo_create(struct device *dev, struct device_node *np, int id,
                        void __iomem *serdes, const struct qmp_phy_cfg *cfg)
 {
@@ -2632,9 +2632,9 @@ static int qmp_combo_create(struct device *dev, struct device_node *np, int id,
        }
 
        if (cfg->type == PHY_TYPE_DP)
-               ops = &qmp_combo_dp_ops;
+               ops = &qmp_combo_dp_phy_ops;
        else
-               ops = &qmp_combo_usb_ops;
+               ops = &qmp_combo_usb_phy_ops;
 
        generic_phy = devm_phy_create(dev, np, ops);
        if (IS_ERR(generic_phy)) {