Commit d6c81688 authored by Johan Hovold's avatar Johan Hovold Committed by Vinod Koul
Browse files

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: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20221114110621.4639-5-johan+linaro@kernel.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 987a505f

drivers/phy/qualcomm/phy-qcom-qmp-combo.c

+20 −20
Original line number Diff line number Diff line
@@ -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)) {