Skip to content

Commit e1f0861

Browse files
masneybandersson
authored andcommitted
clk: qcom: alpha-pll: convert from divider_round_rate() to divider_determine_rate()
The divider_round_rate() function is now deprecated, so let's migrate to divider_determine_rate() instead so that this deprecated API can be removed. Note that when the main function itself was migrated to use determine_rate, this was mistakenly converted to: req->rate = divider_round_rate(...) This is invalid in the case when an error occurs since it can set the rate to a negative value. Fixes: 0e56e33 ("clk: qcom: alpha-pll: convert from round_rate() to determine_rate()") Signed-off-by: Brian Masney <bmasney@redhat.com> Reviewed-by: Abel Vesa <abel.vesa@oss.qualcomm.com> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Link: https://lore.kernel.org/r/20260108-clk-divider-round-rate-v1-14-535a3ed73bf3@redhat.com Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 685ec34 commit e1f0861

1 file changed

Lines changed: 6 additions & 15 deletions

File tree

drivers/clk/qcom/clk-alpha-pll.c

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,11 +1270,8 @@ static int clk_alpha_pll_postdiv_determine_rate(struct clk_hw *hw,
12701270
else
12711271
table = clk_alpha_div_table;
12721272

1273-
req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
1274-
table, pll->width,
1275-
CLK_DIVIDER_POWER_OF_TWO);
1276-
1277-
return 0;
1273+
return divider_determine_rate(hw, req, table, pll->width,
1274+
CLK_DIVIDER_POWER_OF_TWO);
12781275
}
12791276

12801277
static int clk_alpha_pll_postdiv_ro_determine_rate(struct clk_hw *hw,
@@ -1630,11 +1627,8 @@ static int clk_trion_pll_postdiv_determine_rate(struct clk_hw *hw,
16301627
{
16311628
struct clk_alpha_pll_postdiv *pll = to_clk_alpha_pll_postdiv(hw);
16321629

1633-
req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
1634-
pll->post_div_table,
1635-
pll->width, CLK_DIVIDER_ROUND_CLOSEST);
1636-
1637-
return 0;
1630+
return divider_determine_rate(hw, req, pll->post_div_table, pll->width,
1631+
CLK_DIVIDER_ROUND_CLOSEST);
16381632
};
16391633

16401634
static int
@@ -1670,11 +1664,8 @@ static int clk_alpha_pll_postdiv_fabia_determine_rate(struct clk_hw *hw,
16701664
{
16711665
struct clk_alpha_pll_postdiv *pll = to_clk_alpha_pll_postdiv(hw);
16721666

1673-
req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
1674-
pll->post_div_table,
1675-
pll->width, CLK_DIVIDER_ROUND_CLOSEST);
1676-
1677-
return 0;
1667+
return divider_determine_rate(hw, req, pll->post_div_table, pll->width,
1668+
CLK_DIVIDER_ROUND_CLOSEST);
16781669
}
16791670

16801671
static int clk_alpha_pll_postdiv_fabia_set_rate(struct clk_hw *hw,

0 commit comments

Comments
 (0)