clk: hisilicon: clkdivider-hi6220: convert from divider_round_rate() to divider_deter...

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: 619a6210f398 ("clk: hisilicon: clkdivider-hi6220: convert from round_rate() to determine_rate()")
Signed-off-by: Brian Masney <bmasney@redhat.com>

diff --git a/drivers/clk/hisilicon/clkdivider-hi6220.c b/drivers/clk/hisilicon/clkdivider-hi6220.c
index 6bae18a84cb6c0e19dd00762613fd9051849fdd0..fd7ceb92d6515757f79cd0496ce4a8ae7220f321 100644 (file)
--- a/drivers/clk/hisilicon/clkdivider-hi6220.c
+++ b/drivers/clk/hisilicon/clkdivider-hi6220.c
@@ -60,10 +60,8 @@ static int hi6220_clkdiv_determine_rate(struct clk_hw *hw,
 {
        struct hi6220_clk_divider *dclk = to_hi6220_clk_divider(hw);
 
-       req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate, dclk->table,
-                                      dclk->width, CLK_DIVIDER_ROUND_CLOSEST);
-
-       return 0;
+       return divider_determine_rate(hw, req, dclk->table, dclk->width,
+                                     CLK_DIVIDER_ROUND_CLOSEST);
 }
 
 static int hi6220_clkdiv_set_rate(struct clk_hw *hw, unsigned long rate,