@@ -1842,7 +1842,7 @@ static int qcom_qmp_v4_dp_phy_calibrate(struct qmp_phy *qphy)
return 0;
}
-static int qcom_qmp_dp_phy_configure(struct phy *phy, union phy_configure_opts *opts)
+static int qmp_combo_dp_configure(struct phy *phy, union phy_configure_opts *opts)
{
const struct phy_configure_opts_dp *dp_opts = &opts->dp;
struct qmp_phy *qphy = phy_get_drvdata(phy);
@@ -1857,7 +1857,7 @@ static int qcom_qmp_dp_phy_configure(struct phy *phy, union phy_configure_opts *
return 0;
}
-static int qcom_qmp_dp_phy_calibrate(struct phy *phy)
+static int qmp_combo_dp_calibrate(struct phy *phy)
{
struct qmp_phy *qphy = phy_get_drvdata(phy);
const struct qmp_phy_cfg *cfg = qphy->cfg;
@@ -2127,9 +2127,9 @@ static const struct phy_ops qmp_combo_usb_phy_ops = {
static const struct phy_ops qmp_combo_dp_phy_ops = {
.init = qmp_combo_dp_init,
- .configure = qcom_qmp_dp_phy_configure,
+ .configure = qmp_combo_dp_configure,
.power_on = qmp_combo_power_on,
- .calibrate = qcom_qmp_dp_phy_calibrate,
+ .calibrate = qmp_combo_dp_calibrate,
.power_off = qmp_combo_power_off,
.exit = qmp_combo_dp_exit,
.owner = THIS_MODULE,
Rename the configure and calibrate DP PHY ops using the common prefix for consistency. Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)