From: Brian Masney Date: Mon, 11 Aug 2025 15:19:46 +0000 (-0400) Subject: clk: fixed-factor: drop round_rate() clk ops X-Git-Tag: v6.18-rc1~50^2^2~2^2~14 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0c26569d3ad5a5ad0283b72ec91581bec581845;p=thirdparty%2Fkernel%2Flinux.git clk: fixed-factor: drop round_rate() clk ops This driver implements both the determine_rate() and round_rate() clk ops, and the round_rate() clk ops is deprecated. When both are defined, clk_core_determine_round_nolock() from the clk core will only use the determine_rate() clk ops. Also all clk drivers that directly calls fixed-factor's round_rate() have been migrated over to determine_rate(). So let's remove the round_rate() clk ops. Reviewed-by: Alexander Sverdlin Signed-off-by: Brian Masney --- diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c index 79b9a8c57d4b..de658c9e4c53 100644 --- a/drivers/clk/clk-fixed-factor.c +++ b/drivers/clk/clk-fixed-factor.c @@ -47,21 +47,6 @@ static int clk_factor_determine_rate(struct clk_hw *hw, return 0; } -static long clk_factor_round_rate(struct clk_hw *hw, unsigned long rate, - unsigned long *prate) -{ - struct clk_fixed_factor *fix = to_clk_fixed_factor(hw); - - if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) { - unsigned long best_parent; - - best_parent = (rate / fix->mult) * fix->div; - *prate = clk_hw_round_rate(clk_hw_get_parent(hw), best_parent); - } - - return (*prate / fix->div) * fix->mult; -} - static int clk_factor_set_rate(struct clk_hw *hw, unsigned long rate, unsigned long parent_rate) { @@ -87,7 +72,6 @@ static unsigned long clk_factor_recalc_accuracy(struct clk_hw *hw, const struct clk_ops clk_fixed_factor_ops = { .determine_rate = clk_factor_determine_rate, - .round_rate = clk_factor_round_rate, .set_rate = clk_factor_set_rate, .recalc_rate = clk_factor_recalc_rate, .recalc_accuracy = clk_factor_recalc_accuracy,