Skip to content

Commit 9329d78

Browse files
committed
clk: nuvoton: ma35d1-divider: 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: 215f8aa ("clk: nuvoton: ma35d1-divider: convert from round_rate() to determine_rate()") Signed-off-by: Brian Masney <bmasney@redhat.com>
1 parent 865e63b commit 9329d78

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

drivers/clk/nuvoton/clk-ma35d1-divider.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,8 @@ static int ma35d1_clkdiv_determine_rate(struct clk_hw *hw,
4444
{
4545
struct ma35d1_adc_clk_div *dclk = to_ma35d1_adc_clk_div(hw);
4646

47-
req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
48-
dclk->table, dclk->width,
49-
CLK_DIVIDER_ROUND_CLOSEST);
50-
51-
return 0;
47+
return divider_determine_rate(hw, req, dclk->table, dclk->width,
48+
CLK_DIVIDER_ROUND_CLOSEST);
5249
}
5350

5451
static int ma35d1_clkdiv_set_rate(struct clk_hw *hw, unsigned long rate, unsigned long parent_rate)

0 commit comments

Comments
 (0)