Skip to content

Commit 11d3c67

Browse files
committed
clk: loongson1: 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: bb40a2e ("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>
1 parent e3a5249 commit 11d3c67

1 file changed

Lines changed: 1 addition & 4 deletions

File tree

drivers/clk/clk-loongson1.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,7 @@ static int ls1x_divider_determine_rate(struct clk_hw *hw,
9999
struct ls1x_clk *ls1x_clk = to_ls1x_clk(hw);
100100
const struct ls1x_clk_div_data *d = ls1x_clk->data;
101101

102-
req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
103-
d->table, d->width, d->flags);
104-
105-
return 0;
102+
return divider_determine_rate(hw, req, d->table, d->width, d->flags);
106103
}
107104

108105
static int ls1x_divider_set_rate(struct clk_hw *hw, unsigned long rate,

0 commit comments

Comments
 (0)