Skip to content

Commit e3a5249

Browse files
committed
clk: hisilicon: clkdivider-hi6220: 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: 619a621 ("clk: hisilicon: clkdivider-hi6220: convert from round_rate() to determine_rate()") Signed-off-by: Brian Masney <bmasney@redhat.com>
1 parent 463b97b commit e3a5249

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/clk/hisilicon/clkdivider-hi6220.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,8 @@ static int hi6220_clkdiv_determine_rate(struct clk_hw *hw,
6060
{
6161
struct hi6220_clk_divider *dclk = to_hi6220_clk_divider(hw);
6262

63-
req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate, dclk->table,
64-
dclk->width, CLK_DIVIDER_ROUND_CLOSEST);
65-
66-
return 0;
63+
return divider_determine_rate(hw, req, dclk->table, dclk->width,
64+
CLK_DIVIDER_ROUND_CLOSEST);
6765
}
6866

6967
static int hi6220_clkdiv_set_rate(struct clk_hw *hw, unsigned long rate,

0 commit comments

Comments
 (0)