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

phy: qcom-qmp-usb: shorten function prefixes 



The driver function prefix has gotten unnecessarily long and hurts
readability.

Shorten "qcom_qmp_phy_" to "qmp_" (which likely stands for "Qualcomm
Multi PHY" or similar anyway).

Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20220907110728.19092-17-johan+linaro@kernel.org


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

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

+1 −2
Original line number Diff line number Diff line
@@ -1105,8 +1105,7 @@ static const struct phy_ops qcom_qmp_ufs_ops = { 
	.owner		= THIS_MODULE,

};



static

int qmp_ufs_create(struct device *dev, struct device_node *np, int id,

static int qmp_ufs_create(struct device *dev, struct device_node *np, int id,

			void __iomem *serdes, const struct qmp_phy_cfg *cfg)

{

	struct qcom_qmp *qmp = dev_get_drvdata(dev);

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

+59 −62
Original line number Diff line number Diff line
@@ -2103,7 +2103,7 @@ static const struct qmp_phy_cfg qcm2290_usb3phy_cfg = { 
	.is_dual_lane_phy	= true,

};



static void qcom_qmp_phy_usb_configure_lane(void __iomem *base,

static void qmp_usb_configure_lane(void __iomem *base,

					const unsigned int *regs,

					const struct qmp_phy_init_tbl tbl[],

					int num,
@@ -2126,27 +2126,27 @@ static void qcom_qmp_phy_usb_configure_lane(void __iomem *base, 
	}

}



static void qcom_qmp_phy_usb_configure(void __iomem *base,

static void qmp_usb_configure(void __iomem *base,

				   const unsigned int *regs,

				   const struct qmp_phy_init_tbl tbl[],

				   int num)

{

	qcom_qmp_phy_usb_configure_lane(base, regs, tbl, num, 0xff);

	qmp_usb_configure_lane(base, regs, tbl, num, 0xff);

}



static int qcom_qmp_phy_usb_serdes_init(struct qmp_phy *qphy)

static int qmp_usb_serdes_init(struct qmp_phy *qphy)

{

	const struct qmp_phy_cfg *cfg = qphy->cfg;

	void __iomem *serdes = qphy->serdes;

	const struct qmp_phy_init_tbl *serdes_tbl = cfg->serdes_tbl;

	int serdes_tbl_num = cfg->serdes_tbl_num;



	qcom_qmp_phy_usb_configure(serdes, cfg->regs, serdes_tbl, serdes_tbl_num);

	qmp_usb_configure(serdes, cfg->regs, serdes_tbl, serdes_tbl_num);



	return 0;

}



static int qcom_qmp_phy_usb_com_init(struct qmp_phy *qphy)

static int qmp_usb_com_init(struct qmp_phy *qphy)

{

	struct qcom_qmp *qmp = qphy->qmp;

	const struct qmp_phy_cfg *cfg = qphy->cfg;
@@ -2218,7 +2218,7 @@ static int qcom_qmp_phy_usb_com_init(struct qmp_phy *qphy) 
	return ret;

}



static int qcom_qmp_phy_usb_com_exit(struct qmp_phy *qphy)

static int qmp_usb_com_exit(struct qmp_phy *qphy)

{

	struct qcom_qmp *qmp = qphy->qmp;

	const struct qmp_phy_cfg *cfg = qphy->cfg;
@@ -2232,21 +2232,21 @@ static int qcom_qmp_phy_usb_com_exit(struct qmp_phy *qphy) 
	return 0;

}



static int qcom_qmp_phy_usb_init(struct phy *phy)

static int qmp_usb_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 = qcom_qmp_phy_usb_com_init(qphy);

	ret = qmp_usb_com_init(qphy);

	if (ret)

		return ret;



	return 0;

}



static int qcom_qmp_phy_usb_power_on(struct phy *phy)

static int qmp_usb_power_on(struct phy *phy)

{

	struct qmp_phy *qphy = phy_get_drvdata(phy);

	struct qcom_qmp *qmp = qphy->qmp;
@@ -2258,7 +2258,7 @@ static int qcom_qmp_phy_usb_power_on(struct phy *phy) 
	unsigned int mask, val, ready;

	int ret;



	qcom_qmp_phy_usb_serdes_init(qphy);

	qmp_usb_serdes_init(qphy);



	ret = clk_prepare_enable(qphy->pipe_clk);

	if (ret) {
@@ -2267,24 +2267,22 @@ static int qcom_qmp_phy_usb_power_on(struct phy *phy) 
	}



	/* Tx, Rx, and PCS configurations */

	qcom_qmp_phy_usb_configure_lane(tx, cfg->regs,

				    cfg->tx_tbl, cfg->tx_tbl_num, 1);

	qmp_usb_configure_lane(tx, cfg->regs, cfg->tx_tbl, cfg->tx_tbl_num, 1);



	if (cfg->is_dual_lane_phy) {

		qcom_qmp_phy_usb_configure_lane(qphy->tx2, cfg->regs,

		qmp_usb_configure_lane(qphy->tx2, cfg->regs,

					cfg->tx_tbl, cfg->tx_tbl_num, 2);

	}



	qcom_qmp_phy_usb_configure_lane(rx, cfg->regs,

				    cfg->rx_tbl, cfg->rx_tbl_num, 1);

	qmp_usb_configure_lane(rx, cfg->regs, cfg->rx_tbl, cfg->rx_tbl_num, 1);



	if (cfg->is_dual_lane_phy) {

		qcom_qmp_phy_usb_configure_lane(qphy->rx2, cfg->regs,

		qmp_usb_configure_lane(qphy->rx2, cfg->regs,

					cfg->rx_tbl, cfg->rx_tbl_num, 2);

	}



	/* Configure link rate, swing, etc. */

	qcom_qmp_phy_usb_configure(pcs, cfg->regs, cfg->pcs_tbl, cfg->pcs_tbl_num);

	qmp_usb_configure(pcs, cfg->regs, cfg->pcs_tbl, cfg->pcs_tbl_num);



	if (cfg->has_pwrdn_delay)

		usleep_range(cfg->pwrdn_delay_min, cfg->pwrdn_delay_max);
@@ -2314,7 +2312,7 @@ static int qcom_qmp_phy_usb_power_on(struct phy *phy) 
	return ret;

}



static int qcom_qmp_phy_usb_power_off(struct phy *phy)

static int qmp_usb_power_off(struct phy *phy)

{

	struct qmp_phy *qphy = phy_get_drvdata(phy);

	const struct qmp_phy_cfg *cfg = qphy->cfg;
@@ -2339,42 +2337,41 @@ static int qcom_qmp_phy_usb_power_off(struct phy *phy) 
	return 0;

}



static int qcom_qmp_phy_usb_exit(struct phy *phy)

static int qmp_usb_exit(struct phy *phy)

{

	struct qmp_phy *qphy = phy_get_drvdata(phy);



	qcom_qmp_phy_usb_com_exit(qphy);

	qmp_usb_com_exit(qphy);



	return 0;

}



static int qcom_qmp_phy_usb_enable(struct phy *phy)

static int qmp_usb_enable(struct phy *phy)

{

	int ret;



	ret = qcom_qmp_phy_usb_init(phy);

	ret = qmp_usb_init(phy);

	if (ret)

		return ret;



	ret = qcom_qmp_phy_usb_power_on(phy);

	ret = qmp_usb_power_on(phy);

	if (ret)

		qcom_qmp_phy_usb_exit(phy);

		qmp_usb_exit(phy);



	return ret;

}



static int qcom_qmp_phy_usb_disable(struct phy *phy)

static int qmp_usb_disable(struct phy *phy)

{

	int ret;



	ret = qcom_qmp_phy_usb_power_off(phy);

	ret = qmp_usb_power_off(phy);

	if (ret)

		return ret;

	return qcom_qmp_phy_usb_exit(phy);

	return qmp_usb_exit(phy);

}



static int qcom_qmp_phy_usb_set_mode(struct phy *phy,

				 enum phy_mode mode, int submode)

static int qmp_usb_set_mode(struct phy *phy, enum phy_mode mode, int submode)

{

	struct qmp_phy *qphy = phy_get_drvdata(phy);
@@ -2383,7 +2380,7 @@ static int qcom_qmp_phy_usb_set_mode(struct phy *phy, 
	return 0;

}



static void qcom_qmp_phy_usb_enable_autonomous_mode(struct qmp_phy *qphy)

static void qmp_usb_enable_autonomous_mode(struct qmp_phy *qphy)

{

	const struct qmp_phy_cfg *cfg = qphy->cfg;

	void __iomem *pcs_usb = qphy->pcs_usb ?: qphy->pcs;
@@ -2412,7 +2409,7 @@ static void qcom_qmp_phy_usb_enable_autonomous_mode(struct qmp_phy *qphy) 
		qphy_clrbits(pcs_misc, QPHY_V3_PCS_MISC_CLAMP_ENABLE, CLAMP_EN);

}



static void qcom_qmp_phy_usb_disable_autonomous_mode(struct qmp_phy *qphy)

static void qmp_usb_disable_autonomous_mode(struct qmp_phy *qphy)

{

	const struct qmp_phy_cfg *cfg = qphy->cfg;

	void __iomem *pcs_usb = qphy->pcs_usb ?: qphy->pcs;
@@ -2430,7 +2427,7 @@ static void qcom_qmp_phy_usb_disable_autonomous_mode(struct qmp_phy *qphy) 
	qphy_clrbits(pcs_usb, cfg->regs[QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR], IRQ_CLEAR);

}



static int __maybe_unused qcom_qmp_phy_usb_runtime_suspend(struct device *dev)

static int __maybe_unused qmp_usb_runtime_suspend(struct device *dev)

{

	struct qcom_qmp *qmp = dev_get_drvdata(dev);

	struct qmp_phy *qphy = qmp->phys[0];
@@ -2447,7 +2444,7 @@ static int __maybe_unused qcom_qmp_phy_usb_runtime_suspend(struct device *dev) 
		return 0;

	}



	qcom_qmp_phy_usb_enable_autonomous_mode(qphy);

	qmp_usb_enable_autonomous_mode(qphy);



	clk_disable_unprepare(qphy->pipe_clk);

	clk_bulk_disable_unprepare(cfg->num_clks, qmp->clks);
@@ -2455,7 +2452,7 @@ static int __maybe_unused qcom_qmp_phy_usb_runtime_suspend(struct device *dev) 
	return 0;

}



static int __maybe_unused qcom_qmp_phy_usb_runtime_resume(struct device *dev)

static int __maybe_unused qmp_usb_runtime_resume(struct device *dev)

{

	struct qcom_qmp *qmp = dev_get_drvdata(dev);

	struct qmp_phy *qphy = qmp->phys[0];
@@ -2484,12 +2481,12 @@ static int __maybe_unused qcom_qmp_phy_usb_runtime_resume(struct device *dev) 
		return ret;

	}



	qcom_qmp_phy_usb_disable_autonomous_mode(qphy);

	qmp_usb_disable_autonomous_mode(qphy);



	return 0;

}



static int qcom_qmp_phy_usb_vreg_init(struct device *dev, const struct qmp_phy_cfg *cfg)

static int qmp_usb_vreg_init(struct device *dev, const struct qmp_phy_cfg *cfg)

{

	struct qcom_qmp *qmp = dev_get_drvdata(dev);

	int num = cfg->num_vregs;
@@ -2505,7 +2502,7 @@ static int qcom_qmp_phy_usb_vreg_init(struct device *dev, const struct qmp_phy_c 
	return devm_regulator_bulk_get(dev, num, qmp->vregs);

}



static int qcom_qmp_phy_usb_reset_init(struct device *dev, const struct qmp_phy_cfg *cfg)

static int qmp_usb_reset_init(struct device *dev, const struct qmp_phy_cfg *cfg)

{

	struct qcom_qmp *qmp = dev_get_drvdata(dev);

	int i;
@@ -2526,7 +2523,7 @@ static int qcom_qmp_phy_usb_reset_init(struct device *dev, const struct qmp_phy_ 
	return 0;

}



static int qcom_qmp_phy_usb_clk_init(struct device *dev, const struct qmp_phy_cfg *cfg)

static int qmp_usb_clk_init(struct device *dev, const struct qmp_phy_cfg *cfg)

{

	struct qcom_qmp *qmp = dev_get_drvdata(dev);

	int num = cfg->num_clks;
@@ -2602,15 +2599,15 @@ static int phy_pipe_clk_register(struct qcom_qmp *qmp, struct device_node *np) 
	return devm_add_action_or_reset(qmp->dev, phy_clk_release_provider, np);

}



static const struct phy_ops qcom_qmp_phy_usb_ops = {

	.init		= qcom_qmp_phy_usb_enable,

	.exit		= qcom_qmp_phy_usb_disable,

	.set_mode	= qcom_qmp_phy_usb_set_mode,

static const struct phy_ops qmp_usb_ops = {

	.init		= qmp_usb_enable,

	.exit		= qmp_usb_disable,

	.set_mode	= qmp_usb_set_mode,

	.owner		= THIS_MODULE,

};



static

int qcom_qmp_phy_usb_create(struct device *dev, struct device_node *np, int id,

int qmp_usb_create(struct device *dev, struct device_node *np, int id,

			void __iomem *serdes, const struct qmp_phy_cfg *cfg)

{

	struct qcom_qmp *qmp = dev_get_drvdata(dev);
@@ -2680,7 +2677,7 @@ int qcom_qmp_phy_usb_create(struct device *dev, struct device_node *np, int id, 
				     "failed to get lane%d pipe clock\n", id);

	}



	generic_phy = devm_phy_create(dev, np, &qcom_qmp_phy_usb_ops);

	generic_phy = devm_phy_create(dev, np, &qmp_usb_ops);

	if (IS_ERR(generic_phy)) {

		ret = PTR_ERR(generic_phy);

		dev_err(dev, "failed to create qphy %d\n", ret);
@@ -2696,7 +2693,7 @@ int qcom_qmp_phy_usb_create(struct device *dev, struct device_node *np, int id, 
	return 0;

}



static const struct of_device_id qcom_qmp_phy_usb_of_match_table[] = {

static const struct of_device_id qmp_usb_of_match_table[] = {

	{

		.compatible = "qcom,ipq8074-qmp-usb3-phy",

		.data = &ipq8074_usb3phy_cfg,
@@ -2757,14 +2754,14 @@ static const struct of_device_id qcom_qmp_phy_usb_of_match_table[] = { 
	},

	{ },

};

MODULE_DEVICE_TABLE(of, qcom_qmp_phy_usb_of_match_table);

MODULE_DEVICE_TABLE(of, qmp_usb_of_match_table);



static const struct dev_pm_ops qcom_qmp_phy_usb_pm_ops = {

	SET_RUNTIME_PM_OPS(qcom_qmp_phy_usb_runtime_suspend,

			   qcom_qmp_phy_usb_runtime_resume, NULL)

static const struct dev_pm_ops qmp_usb_pm_ops = {

	SET_RUNTIME_PM_OPS(qmp_usb_runtime_suspend,

			   qmp_usb_runtime_resume, NULL)

};



static int qcom_qmp_phy_usb_probe(struct platform_device *pdev)

static int qmp_usb_probe(struct platform_device *pdev)

{

	struct qcom_qmp *qmp;

	struct device *dev = &pdev->dev;
@@ -2799,15 +2796,15 @@ static int qcom_qmp_phy_usb_probe(struct platform_device *pdev) 
			return PTR_ERR(qmp->dp_com);

	}



	ret = qcom_qmp_phy_usb_clk_init(dev, cfg);

	ret = qmp_usb_clk_init(dev, cfg);

	if (ret)

		return ret;



	ret = qcom_qmp_phy_usb_reset_init(dev, cfg);

	ret = qmp_usb_reset_init(dev, cfg);

	if (ret)

		return ret;



	ret = qcom_qmp_phy_usb_vreg_init(dev, cfg);

	ret = qmp_usb_vreg_init(dev, cfg);

	if (ret) {

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "failed to get regulator supplies: %d\n",
@@ -2837,7 +2834,7 @@ static int qcom_qmp_phy_usb_probe(struct platform_device *pdev) 
	id = 0;

	for_each_available_child_of_node(dev->of_node, child) {

		/* Create per-lane phy */

		ret = qcom_qmp_phy_usb_create(dev, child, id, serdes, cfg);

		ret = qmp_usb_create(dev, child, id, serdes, cfg);

		if (ret) {

			dev_err(dev, "failed to create lane%d phy, %d\n",

				id, ret);
@@ -2867,16 +2864,16 @@ static int qcom_qmp_phy_usb_probe(struct platform_device *pdev) 
	return ret;

}



static struct platform_driver qcom_qmp_phy_usb_driver = {

	.probe		= qcom_qmp_phy_usb_probe,

static struct platform_driver qmp_usb_driver = {

	.probe		= qmp_usb_probe,

	.driver = {

		.name	= "qcom-qmp-usb-phy",

		.pm	= &qcom_qmp_phy_usb_pm_ops,

		.of_match_table = qcom_qmp_phy_usb_of_match_table,

		.pm	= &qmp_usb_pm_ops,

		.of_match_table = qmp_usb_of_match_table,

	},

};



module_platform_driver(qcom_qmp_phy_usb_driver);

module_platform_driver(qmp_usb_driver);



MODULE_AUTHOR("Vivek Gautam <vivek.gautam@codeaurora.org>");

MODULE_DESCRIPTION("Qualcomm QMP USB PHY driver");