Skip to content

L
linux
Commit c577468c authored by Johan Hovold's avatar Johan Hovold Committed by Vinod Koul
Browse files
Options

phy: qcom-qmp-pcie-msm8996: 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-15-johan+linaro@kernel.orgSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent d0eec88b
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 47 deletions
drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c
View file @ c577468c
...@@ -356,7 +356,7 @@ static const struct qmp_phy_cfg msm8996_pciephy_cfg = { ...@@ -356,7 +356,7 @@ static const struct qmp_phy_cfg msm8996_pciephy_cfg = {
.pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX,
}; };
static void qcom_qmp_phy_pcie_msm8996_configure_lane(void __iomem *base, static void qmp_pcie_msm8996_configure_lane(void __iomem *base,
const unsigned int *regs, const unsigned int *regs,
const struct qmp_phy_init_tbl tbl[], const struct qmp_phy_init_tbl tbl[],
int num, int num,
...@@ -379,15 +379,15 @@ static void qcom_qmp_phy_pcie_msm8996_configure_lane(void __iomem *base, ...@@ -379,15 +379,15 @@ static void qcom_qmp_phy_pcie_msm8996_configure_lane(void __iomem *base,
} }
} }
static void qcom_qmp_phy_pcie_msm8996_configure(void __iomem *base, static void qmp_pcie_msm8996_configure(void __iomem *base,
const unsigned int *regs, const unsigned int *regs,
const struct qmp_phy_init_tbl tbl[], const struct qmp_phy_init_tbl tbl[],
int num) int num)
{ {
qcom_qmp_phy_pcie_msm8996_configure_lane(base, regs, tbl, num, 0xff); qmp_pcie_msm8996_configure_lane(base, regs, tbl, num, 0xff);
} }
static int qcom_qmp_phy_pcie_msm8996_serdes_init(struct qmp_phy *qphy) static int qmp_pcie_msm8996_serdes_init(struct qmp_phy *qphy)
{ {
struct qcom_qmp *qmp = qphy->qmp; struct qcom_qmp *qmp = qphy->qmp;
const struct qmp_phy_cfg *cfg = qphy->cfg; const struct qmp_phy_cfg *cfg = qphy->cfg;
...@@ -398,7 +398,7 @@ static int qcom_qmp_phy_pcie_msm8996_serdes_init(struct qmp_phy *qphy) ...@@ -398,7 +398,7 @@ static int qcom_qmp_phy_pcie_msm8996_serdes_init(struct qmp_phy *qphy)
unsigned int mask, val; unsigned int mask, val;
int ret; int ret;
qcom_qmp_phy_pcie_msm8996_configure(serdes, cfg->regs, serdes_tbl, serdes_tbl_num); qmp_pcie_msm8996_configure(serdes, cfg->regs, serdes_tbl, serdes_tbl_num);
qphy_clrbits(serdes, cfg->regs[QPHY_COM_SW_RESET], SW_RESET); qphy_clrbits(serdes, cfg->regs[QPHY_COM_SW_RESET], SW_RESET);
qphy_setbits(serdes, cfg->regs[QPHY_COM_START_CONTROL], qphy_setbits(serdes, cfg->regs[QPHY_COM_START_CONTROL],
...@@ -418,7 +418,7 @@ static int qcom_qmp_phy_pcie_msm8996_serdes_init(struct qmp_phy *qphy) ...@@ -418,7 +418,7 @@ static int qcom_qmp_phy_pcie_msm8996_serdes_init(struct qmp_phy *qphy)
return 0; return 0;
} }
static int qcom_qmp_phy_pcie_msm8996_com_init(struct qmp_phy *qphy) static int qmp_pcie_msm8996_com_init(struct qmp_phy *qphy)
{ {
struct qcom_qmp *qmp = qphy->qmp; struct qcom_qmp *qmp = qphy->qmp;
const struct qmp_phy_cfg *cfg = qphy->cfg; const struct qmp_phy_cfg *cfg = qphy->cfg;
...@@ -471,7 +471,7 @@ static int qcom_qmp_phy_pcie_msm8996_com_init(struct qmp_phy *qphy) ...@@ -471,7 +471,7 @@ static int qcom_qmp_phy_pcie_msm8996_com_init(struct qmp_phy *qphy)
return ret; return ret;
} }
static int qcom_qmp_phy_pcie_msm8996_com_exit(struct qmp_phy *qphy) static int qmp_pcie_msm8996_com_exit(struct qmp_phy *qphy)
{ {
struct qcom_qmp *qmp = qphy->qmp; struct qcom_qmp *qmp = qphy->qmp;
const struct qmp_phy_cfg *cfg = qphy->cfg; const struct qmp_phy_cfg *cfg = qphy->cfg;
...@@ -501,21 +501,21 @@ static int qcom_qmp_phy_pcie_msm8996_com_exit(struct qmp_phy *qphy) ...@@ -501,21 +501,21 @@ static int qcom_qmp_phy_pcie_msm8996_com_exit(struct qmp_phy *qphy)
return 0; return 0;
} }
static int qcom_qmp_phy_pcie_msm8996_init(struct phy *phy) static int qmp_pcie_msm8996_init(struct phy *phy)
{ {
struct qmp_phy *qphy = phy_get_drvdata(phy); struct qmp_phy *qphy = phy_get_drvdata(phy);
struct qcom_qmp *qmp = qphy->qmp; struct qcom_qmp *qmp = qphy->qmp;
int ret; int ret;
dev_vdbg(qmp->dev, "Initializing QMP phy\n"); dev_vdbg(qmp->dev, "Initializing QMP phy\n");
ret = qcom_qmp_phy_pcie_msm8996_com_init(qphy); ret = qmp_pcie_msm8996_com_init(qphy);
if (ret) if (ret)
return ret; return ret;
return 0; return 0;
} }
static int qcom_qmp_phy_pcie_msm8996_power_on(struct phy *phy) static int qmp_pcie_msm8996_power_on(struct phy *phy)
{ {
struct qmp_phy *qphy = phy_get_drvdata(phy); struct qmp_phy *qphy = phy_get_drvdata(phy);
struct qcom_qmp *qmp = qphy->qmp; struct qcom_qmp *qmp = qphy->qmp;
...@@ -528,7 +528,7 @@ static int qcom_qmp_phy_pcie_msm8996_power_on(struct phy *phy) ...@@ -528,7 +528,7 @@ static int qcom_qmp_phy_pcie_msm8996_power_on(struct phy *phy)
unsigned int mask, val, ready; unsigned int mask, val, ready;
int ret; int ret;
qcom_qmp_phy_pcie_msm8996_serdes_init(qphy); qmp_pcie_msm8996_serdes_init(qphy);
ret = reset_control_deassert(qphy->lane_rst); ret = reset_control_deassert(qphy->lane_rst);
if (ret) { if (ret) {
...@@ -544,15 +544,15 @@ static int qcom_qmp_phy_pcie_msm8996_power_on(struct phy *phy) ...@@ -544,15 +544,15 @@ static int qcom_qmp_phy_pcie_msm8996_power_on(struct phy *phy)
} }
/* Tx, Rx, and PCS configurations */ /* Tx, Rx, and PCS configurations */
qcom_qmp_phy_pcie_msm8996_configure_lane(tx, cfg->regs, qmp_pcie_msm8996_configure_lane(tx, cfg->regs, cfg->tx_tbl,
cfg->tx_tbl, cfg->tx_tbl_num, 1); cfg->tx_tbl_num, 1);
qcom_qmp_phy_pcie_msm8996_configure_lane(rx, cfg->regs, qmp_pcie_msm8996_configure_lane(rx, cfg->regs, cfg->rx_tbl,
cfg->rx_tbl, cfg->rx_tbl_num, 1); cfg->rx_tbl_num, 1);
qcom_qmp_phy_pcie_msm8996_configure(pcs, cfg->regs, cfg->pcs_tbl, cfg->pcs_tbl_num); qmp_pcie_msm8996_configure(pcs, cfg->regs, cfg->pcs_tbl, cfg->pcs_tbl_num);
qcom_qmp_phy_pcie_msm8996_configure(pcs_misc, cfg->regs, cfg->pcs_misc_tbl, qmp_pcie_msm8996_configure(pcs_misc, cfg->regs, cfg->pcs_misc_tbl,
cfg->pcs_misc_tbl_num); cfg->pcs_misc_tbl_num);
/* /*
...@@ -591,7 +591,7 @@ static int qcom_qmp_phy_pcie_msm8996_power_on(struct phy *phy) ...@@ -591,7 +591,7 @@ static int qcom_qmp_phy_pcie_msm8996_power_on(struct phy *phy)
return ret; return ret;
} }
static int qcom_qmp_phy_pcie_msm8996_power_off(struct phy *phy) static int qmp_pcie_msm8996_power_off(struct phy *phy)
{ {
struct qmp_phy *qphy = phy_get_drvdata(phy); struct qmp_phy *qphy = phy_get_drvdata(phy);
const struct qmp_phy_cfg *cfg = qphy->cfg; const struct qmp_phy_cfg *cfg = qphy->cfg;
...@@ -616,43 +616,43 @@ static int qcom_qmp_phy_pcie_msm8996_power_off(struct phy *phy) ...@@ -616,43 +616,43 @@ static int qcom_qmp_phy_pcie_msm8996_power_off(struct phy *phy)
return 0; return 0;
} }
static int qcom_qmp_phy_pcie_msm8996_exit(struct phy *phy) static int qmp_pcie_msm8996_exit(struct phy *phy)
{ {
struct qmp_phy *qphy = phy_get_drvdata(phy); struct qmp_phy *qphy = phy_get_drvdata(phy);
reset_control_assert(qphy->lane_rst); reset_control_assert(qphy->lane_rst);
qcom_qmp_phy_pcie_msm8996_com_exit(qphy); qmp_pcie_msm8996_com_exit(qphy);
return 0; return 0;
} }
static int qcom_qmp_phy_pcie_msm8996_enable(struct phy *phy) static int qmp_pcie_msm8996_enable(struct phy *phy)
{ {
int ret; int ret;
ret = qcom_qmp_phy_pcie_msm8996_init(phy); ret = qmp_pcie_msm8996_init(phy);
if (ret) if (ret)
return ret; return ret;
ret = qcom_qmp_phy_pcie_msm8996_power_on(phy); ret = qmp_pcie_msm8996_power_on(phy);
if (ret) if (ret)
qcom_qmp_phy_pcie_msm8996_exit(phy); qmp_pcie_msm8996_exit(phy);
return ret; return ret;
} }
static int qcom_qmp_phy_pcie_msm8996_disable(struct phy *phy) static int qmp_pcie_msm8996_disable(struct phy *phy)
{ {
int ret; int ret;
ret = qcom_qmp_phy_pcie_msm8996_power_off(phy); ret = qmp_pcie_msm8996_power_off(phy);
if (ret) if (ret)
return ret; return ret;
return qcom_qmp_phy_pcie_msm8996_exit(phy); return qmp_pcie_msm8996_exit(phy);
} }
static int qcom_qmp_phy_pcie_msm8996_vreg_init(struct device *dev, const struct qmp_phy_cfg *cfg) static int qmp_pcie_msm8996_vreg_init(struct device *dev, const struct qmp_phy_cfg *cfg)
{ {
struct qcom_qmp *qmp = dev_get_drvdata(dev); struct qcom_qmp *qmp = dev_get_drvdata(dev);
int num = cfg->num_vregs; int num = cfg->num_vregs;
...@@ -668,7 +668,7 @@ static int qcom_qmp_phy_pcie_msm8996_vreg_init(struct device *dev, const struct ...@@ -668,7 +668,7 @@ static int qcom_qmp_phy_pcie_msm8996_vreg_init(struct device *dev, const struct
return devm_regulator_bulk_get(dev, num, qmp->vregs); return devm_regulator_bulk_get(dev, num, qmp->vregs);
} }
static int qcom_qmp_phy_pcie_msm8996_reset_init(struct device *dev, const struct qmp_phy_cfg *cfg) static int qmp_pcie_msm8996_reset_init(struct device *dev, const struct qmp_phy_cfg *cfg)
{ {
struct qcom_qmp *qmp = dev_get_drvdata(dev); struct qcom_qmp *qmp = dev_get_drvdata(dev);
int i; int i;
...@@ -689,7 +689,7 @@ static int qcom_qmp_phy_pcie_msm8996_reset_init(struct device *dev, const struct ...@@ -689,7 +689,7 @@ static int qcom_qmp_phy_pcie_msm8996_reset_init(struct device *dev, const struct
return 0; return 0;
} }
static int qcom_qmp_phy_pcie_msm8996_clk_init(struct device *dev, const struct qmp_phy_cfg *cfg) static int qmp_pcie_msm8996_clk_init(struct device *dev, const struct qmp_phy_cfg *cfg)
{ {
struct qcom_qmp *qmp = dev_get_drvdata(dev); struct qcom_qmp *qmp = dev_get_drvdata(dev);
int num = cfg->num_clks; int num = cfg->num_clks;
...@@ -765,9 +765,9 @@ static int phy_pipe_clk_register(struct qcom_qmp *qmp, struct device_node *np) ...@@ -765,9 +765,9 @@ 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); return devm_add_action_or_reset(qmp->dev, phy_clk_release_provider, np);
} }
static const struct phy_ops qcom_qmp_phy_pcie_msm8996_ops = { static const struct phy_ops qmp_pcie_msm8996_ops = {
.power_on = qcom_qmp_phy_pcie_msm8996_enable, .power_on = qmp_pcie_msm8996_enable,
.power_off = qcom_qmp_phy_pcie_msm8996_disable, .power_off = qmp_pcie_msm8996_disable,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
...@@ -776,8 +776,7 @@ static void qcom_qmp_reset_control_put(void *data) ...@@ -776,8 +776,7 @@ static void qcom_qmp_reset_control_put(void *data)
reset_control_put(data); reset_control_put(data);
} }
static static int qmp_pcie_msm8996_create(struct device *dev, struct device_node *np, int id,
int qcom_qmp_phy_pcie_msm8996_create(struct device *dev, struct device_node *np, int id,
void __iomem *serdes, const struct qmp_phy_cfg *cfg) void __iomem *serdes, const struct qmp_phy_cfg *cfg)
{ {
struct qcom_qmp *qmp = dev_get_drvdata(dev); struct qcom_qmp *qmp = dev_get_drvdata(dev);
...@@ -830,7 +829,7 @@ int qcom_qmp_phy_pcie_msm8996_create(struct device *dev, struct device_node *np, ...@@ -830,7 +829,7 @@ int qcom_qmp_phy_pcie_msm8996_create(struct device *dev, struct device_node *np,
if (ret) if (ret)
return ret; return ret;
generic_phy = devm_phy_create(dev, np, &qcom_qmp_phy_pcie_msm8996_ops); generic_phy = devm_phy_create(dev, np, &qmp_pcie_msm8996_ops);
if (IS_ERR(generic_phy)) { if (IS_ERR(generic_phy)) {
ret = PTR_ERR(generic_phy); ret = PTR_ERR(generic_phy);
dev_err(dev, "failed to create qphy %d\n", ret); dev_err(dev, "failed to create qphy %d\n", ret);
...@@ -846,16 +845,16 @@ int qcom_qmp_phy_pcie_msm8996_create(struct device *dev, struct device_node *np, ...@@ -846,16 +845,16 @@ int qcom_qmp_phy_pcie_msm8996_create(struct device *dev, struct device_node *np,
return 0; return 0;
} }
static const struct of_device_id qcom_qmp_phy_pcie_msm8996_of_match_table[] = { static const struct of_device_id qmp_pcie_msm8996_of_match_table[] = {
{ {
.compatible = "qcom,msm8996-qmp-pcie-phy", .compatible = "qcom,msm8996-qmp-pcie-phy",
.data = &msm8996_pciephy_cfg, .data = &msm8996_pciephy_cfg,
}, },
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, qcom_qmp_phy_pcie_msm8996_of_match_table); MODULE_DEVICE_TABLE(of, qmp_pcie_msm8996_of_match_table);
static int qcom_qmp_phy_pcie_msm8996_probe(struct platform_device *pdev) static int qmp_pcie_msm8996_probe(struct platform_device *pdev)
{ {
struct qcom_qmp *qmp; struct qcom_qmp *qmp;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
...@@ -887,15 +886,15 @@ static int qcom_qmp_phy_pcie_msm8996_probe(struct platform_device *pdev) ...@@ -887,15 +886,15 @@ static int qcom_qmp_phy_pcie_msm8996_probe(struct platform_device *pdev)
mutex_init(&qmp->phy_mutex); mutex_init(&qmp->phy_mutex);
ret = qcom_qmp_phy_pcie_msm8996_clk_init(dev, cfg); ret = qmp_pcie_msm8996_clk_init(dev, cfg);
if (ret) if (ret)
return ret; return ret;
ret = qcom_qmp_phy_pcie_msm8996_reset_init(dev, cfg); ret = qmp_pcie_msm8996_reset_init(dev, cfg);
if (ret) if (ret)
return ret; return ret;
ret = qcom_qmp_phy_pcie_msm8996_vreg_init(dev, cfg); ret = qmp_pcie_msm8996_vreg_init(dev, cfg);
if (ret) { if (ret) {
if (ret != -EPROBE_DEFER) if (ret != -EPROBE_DEFER)
dev_err(dev, "failed to get regulator supplies: %d\n", dev_err(dev, "failed to get regulator supplies: %d\n",
...@@ -915,7 +914,7 @@ static int qcom_qmp_phy_pcie_msm8996_probe(struct platform_device *pdev) ...@@ -915,7 +914,7 @@ static int qcom_qmp_phy_pcie_msm8996_probe(struct platform_device *pdev)
id = 0; id = 0;
for_each_available_child_of_node(dev->of_node, child) { for_each_available_child_of_node(dev->of_node, child) {
/* Create per-lane phy */ /* Create per-lane phy */
ret = qcom_qmp_phy_pcie_msm8996_create(dev, child, id, serdes, cfg); ret = qmp_pcie_msm8996_create(dev, child, id, serdes, cfg);
if (ret) { if (ret) {
dev_err(dev, "failed to create lane%d phy, %d\n", dev_err(dev, "failed to create lane%d phy, %d\n",
id, ret); id, ret);
...@@ -945,15 +944,15 @@ static int qcom_qmp_phy_pcie_msm8996_probe(struct platform_device *pdev) ...@@ -945,15 +944,15 @@ static int qcom_qmp_phy_pcie_msm8996_probe(struct platform_device *pdev)
return ret; return ret;
} }
static struct platform_driver qcom_qmp_phy_pcie_msm8996_driver = { static struct platform_driver qmp_pcie_msm8996_driver = {
.probe = qcom_qmp_phy_pcie_msm8996_probe, .probe = qmp_pcie_msm8996_probe,
.driver = { .driver = {
.name = "qcom-qmp-msm8996-pcie-phy", .name = "qcom-qmp-msm8996-pcie-phy",
.of_match_table = qcom_qmp_phy_pcie_msm8996_of_match_table, .of_match_table = qmp_pcie_msm8996_of_match_table,
}, },
}; };
module_platform_driver(qcom_qmp_phy_pcie_msm8996_driver); module_platform_driver(qmp_pcie_msm8996_driver);
MODULE_AUTHOR("Vivek Gautam <vivek.gautam@codeaurora.org>"); MODULE_AUTHOR("Vivek Gautam <vivek.gautam@codeaurora.org>");
MODULE_DESCRIPTION("Qualcomm QMP MSM8996 PCIe PHY driver"); MODULE_DESCRIPTION("Qualcomm QMP MSM8996 PCIe PHY driver");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7