[04/22] phy: qcom-qmp-combo: rename PHY ops structures

Message ID	20221111085643.9478-5-johan+linaro@kernel.org
State	Accepted
Commit	d6c81688f9cd1d198475383c963cd3d9576d29c2
Headers	show Return-Path: <linux-arm-msm-owner@kernel.org> From: Johan Hovold <johan+linaro@kernel.org> To: Vinod Koul <vkoul@kernel.org> Cc: Andy Gross <agross@kernel.org>, Bjorn Andersson <andersson@kernel.org>, Konrad Dybcio <konrad.dybcio@linaro.org>, Dmitry Baryshkov <dmitry.baryshkov@linaro.org>, linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org, Johan Hovold <johan+linaro@kernel.org> Subject: [PATCH 04/22] phy: qcom-qmp-combo: rename PHY ops structures Date: Fri, 11 Nov 2022 09:56:25 +0100 Message-Id: <20221111085643.9478-5-johan+linaro@kernel.org> In-Reply-To: <20221111085643.9478-1-johan+linaro@kernel.org> References: <20221111085643.9478-1-johan+linaro@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	phy: qcom-qmp-combo: preparatory cleanups (set 2/3) \| expand [00/22] phy: qcom-qmp-combo: preparatory cleanups (set 2/3) [01/22] phy: qcom-qmp-combo: sort device-id table [02/22] phy: qcom-qmp-combo: move device-id table [03/22] phy: qcom-qmp-combo: move pm ops [04/22] phy: qcom-qmp-combo: rename PHY ops structures [05/22] phy: qcom-qmp-combo: drop unused DP PHY mode op [06/22] phy: qcom-qmp-combo: rename USB PHY ops [07/22] phy: qcom-qmp-combo: drop unnecessary debug message [08/22] phy: qcom-qmp-combo: separate USB and DP init ops [09/22] phy: qcom-qmp-combo: rename DP PHY ops [10/22] phy: qcom-qmp-combo: separate USB and DP power-on ops [11/22] phy: qcom-qmp-combo: clean up serdes initialisation [12/22] phy: qcom-qmp-combo: separate USB and DP devicetree parsing [13/22] phy: qcom-qmp-combo: add dedicated DP iomem pointers [14/22] phy: qcom-qmp-combo: clean up DP configurations [15/22] phy: qcom-qmp-combo: rename sc8280xp config [16/22] phy: qcom-qmp-combo: add DP configuration tables [17/22] phy: qcom-qmp-combo: merge USB and DP configurations [18/22] phy: qcom-qmp-combo: merge driver data [19/22] phy: qcom-qmp-combo: clean up device-tree parsing [20/22] phy: qcom-qmp-combo: clean up probe initialisation [21/22] phy: qcom-qmp-combo: clean up PHY init [22/22] phy: qcom-qmp-combo: clean up DP callback names

Message ID

20221111085643.9478-5-johan+linaro@kernel.org

State

Accepted

Commit

d6c81688f9cd1d198475383c963cd3d9576d29c2

Headers

From: Johan Hovold <johan+linaro@kernel.org>
To: Vinod Koul <vkoul@kernel.org>
Cc: Andy Gross <agross@kernel.org>,
        Bjorn Andersson <andersson@kernel.org>,
        Konrad Dybcio <konrad.dybcio@linaro.org>,
        Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
        linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org,
        linux-kernel@vger.kernel.org,
        Johan Hovold <johan+linaro@kernel.org>
Subject: [PATCH 04/22] phy: qcom-qmp-combo: rename PHY ops structures
Date: Fri, 11 Nov 2022 09:56:25 +0100
Message-Id: <20221111085643.9478-5-johan+linaro@kernel.org>
In-Reply-To: <20221111085643.9478-1-johan+linaro@kernel.org>
References: <20221111085643.9478-1-johan+linaro@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

phy: qcom-qmp-combo: preparatory cleanups (set 2/3) | expand

Commit Message

Johan Hovold Nov. 11, 2022, 8:56 a.m. UTC

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

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 40 +++++++++++------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
index 2ac29b71d3b7..13800c2243e1 100644
--- 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)) {

[04/22] phy: qcom-qmp-combo: rename PHY ops structures

Commit Message

Patch