| Message ID | 20230820235813.562284-1-dmitry.baryshkov@linaro.org |
|---|---|
| State | Accepted |
| Commit | b83eb8ba2ab9551217ed36320b8999db2f351e57 |
| Headers | show |
| Series | phy: qcom-qmp-combo: fix clock probing | expand |
On Mon, 21 Aug 2023 02:58:13 +0300, Dmitry Baryshkov wrote: > 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. > > [...] Applied, thanks! [1/1] phy: qcom-qmp-combo: fix clock probing commit: b83eb8ba2ab9551217ed36320b8999db2f351e57 Best regards,
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c index 9c3de41ecedb..cbb28afce135 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -3067,12 +3067,6 @@ static int phy_dp_clks_register(struct qmp_combo *qmp, struct device_node *np) if (ret) return ret; - ret = devm_clk_bulk_get_all(qmp->dev, &qmp->clks); - if (ret < 0) - return ret; - - qmp->num_clks = ret; - return 0; } @@ -3332,6 +3326,12 @@ static int qmp_combo_parse_dt_legacy(struct qmp_combo *qmp, struct device_node * if (ret) return ret; + ret = devm_clk_bulk_get_all(qmp->dev, &qmp->clks); + if (ret < 0) + return ret; + + qmp->num_clks = ret; + return 0; }
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: 28e265bf84a8 ("phy: qcom-qmp-combo: simplify clock handling") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)