]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
clk: qcom: alpha-pll: convert from divider_round_rate() to divider_determine_rate()
authorBrian Masney <bmasney@redhat.com>
Thu, 8 Jan 2026 21:16:32 +0000 (16:16 -0500)
committerBjorn Andersson <andersson@kernel.org>
Fri, 9 Jan 2026 18:55:37 +0000 (12:55 -0600)
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: 0e56e3369b60 ("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>
drivers/clk/qcom/clk-alpha-pll.c

index 3fbdee6e67f9c82a2b93f2624a112934f01686d5..f8313f9d0e30ffd5393e3163ebc0e51b2bd96437 100644 (file)
@@ -1270,11 +1270,8 @@ static int clk_alpha_pll_postdiv_determine_rate(struct clk_hw *hw,
        else
                table = clk_alpha_div_table;
 
-       req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
-                                      table, pll->width,
-                                      CLK_DIVIDER_POWER_OF_TWO);
-
-       return 0;
+       return divider_determine_rate(hw, req, table, pll->width,
+                                     CLK_DIVIDER_POWER_OF_TWO);
 }
 
 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,
 {
        struct clk_alpha_pll_postdiv *pll = to_clk_alpha_pll_postdiv(hw);
 
-       req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
-                                      pll->post_div_table,
-                                      pll->width, CLK_DIVIDER_ROUND_CLOSEST);
-
-       return 0;
+       return divider_determine_rate(hw, req, pll->post_div_table, pll->width,
+                                     CLK_DIVIDER_ROUND_CLOSEST);
 };
 
 static int
@@ -1670,11 +1664,8 @@ static int clk_alpha_pll_postdiv_fabia_determine_rate(struct clk_hw *hw,
 {
        struct clk_alpha_pll_postdiv *pll = to_clk_alpha_pll_postdiv(hw);
 
-       req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
-                                      pll->post_div_table,
-                                      pll->width, CLK_DIVIDER_ROUND_CLOSEST);
-
-       return 0;
+       return divider_determine_rate(hw, req, pll->post_div_table, pll->width,
+                                     CLK_DIVIDER_ROUND_CLOSEST);
 }
 
 static int clk_alpha_pll_postdiv_fabia_set_rate(struct clk_hw *hw,