Skip to content

Commit b83eb8b

Browse files
lumagvinodkoul
authored andcommitted
phy: qcom-qmp-combo: fix clock probing
During rebase of qcom-qmp-combo series a call to devm_clk_bulk_get_all() got moved by git from qmp_combo_parse_dt_legacy() to phy_dp_clks_register(). This doesn't have any serious effect, since the clocks will be set in both legacy and non-legacy paths. However let's move it back to place anyway, to prevent the driver from fetching clocks twice. Fixes: 28e265b ("phy: qcom-qmp-combo: simplify clock handling") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Link: https://lore.kernel.org/r/20230820235813.562284-1-dmitry.baryshkov@linaro.org Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent 4807ff7 commit b83eb8b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3067,12 +3067,6 @@ static int phy_dp_clks_register(struct qmp_combo *qmp, struct device_node *np)
30673067
if (ret)
30683068
return ret;
30693069

3070-
ret = devm_clk_bulk_get_all(qmp->dev, &qmp->clks);
3071-
if (ret < 0)
3072-
return ret;
3073-
3074-
qmp->num_clks = ret;
3075-
30763070
return 0;
30773071
}
30783072

@@ -3332,6 +3326,12 @@ static int qmp_combo_parse_dt_legacy(struct qmp_combo *qmp, struct device_node *
33323326
if (ret)
33333327
return ret;
33343328

3329+
ret = devm_clk_bulk_get_all(qmp->dev, &qmp->clks);
3330+
if (ret < 0)
3331+
return ret;
3332+
3333+
qmp->num_clks = ret;
3334+
33353335
return 0;
33363336
}
33373337

0 commit comments

Comments
 (0)