Commit e1f08613 authored by Brian Masney's avatar Brian Masney Committed by Bjorn Andersson
Browse files

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: 0e56e336 ("clk: qcom: alpha-pll: convert from round_rate() to determine_rate()")
Signed-off-by: default avatarBrian Masney <bmasney@redhat.com>
Reviewed-by: default avatarAbel Vesa <abel.vesa@oss.qualcomm.com>
Reviewed-by: default avatarKonrad 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: default avatarBjorn Andersson <andersson@kernel.org>
parent 685ec348

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

+6 −15
Original line number Diff line number Diff line
@@ -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,

	return divider_determine_rate(hw, req, table, pll->width,

				      CLK_DIVIDER_POWER_OF_TWO);



	return 0;

}



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,