]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
clk: loongson1: convert from divider_round_rate() to divider_determine_rate()
authorBrian Masney <bmasney@redhat.com>
Thu, 8 Jan 2026 21:16:27 +0000 (16:16 -0500)
committerBrian Masney <bmasney@redhat.com>
Thu, 22 Jan 2026 15:48:25 +0000 (10:48 -0500)
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: bb40a2ef4fc9 ("clk: loongson1: convert from round_rate() to determine_rate()")
Reviewed-by: Keguang Zhang <keguang.zhang@gmail.com>
Tested-by: Keguang Zhang <keguang.zhang@gmail.com> # on LS1B & LS1C
Signed-off-by: Brian Masney <bmasney@redhat.com>
drivers/clk/clk-loongson1.c

index f9f060d08a5fae3291a9408c6dc93531b435609f..1674181a1107dc4f30e78ee410a55a49b6d0b4b5 100644 (file)
@@ -99,10 +99,7 @@ static int ls1x_divider_determine_rate(struct clk_hw *hw,
        struct ls1x_clk *ls1x_clk = to_ls1x_clk(hw);
        const struct ls1x_clk_div_data *d = ls1x_clk->data;
 
-       req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
-                                      d->table, d->width, d->flags);
-
-       return 0;
+       return divider_determine_rate(hw, req, d->table, d->width, d->flags);
 }
 
 static int ls1x_divider_set_rate(struct clk_hw *hw, unsigned long rate,