clk: bm1880: convert from divider_ro_round_rate() to divider_ro_determine_rate()

The divider_ro_round_rate() function is now deprecated, so let's migrate
to divider_ro_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: cf1d95fa0c64 ("clk: bm1880: convert from divider_round_rate() to divider_determine_rate()")
Acked-by: Manivannan Sadhasivam <mani@kernel.org>
Signed-off-by: Brian Masney <bmasney@redhat.com>

diff --git a/drivers/clk/clk-bm1880.c b/drivers/clk/clk-bm1880.c
index dac190bc6e19a6dd4be413ea52d41f74934a1aa9..536df8e828eab83fbd3812135139c703aa7a1ce3 100644 (file)
--- a/drivers/clk/clk-bm1880.c
+++ b/drivers/clk/clk-bm1880.c
@@ -621,12 +621,8 @@ static int bm1880_clk_div_determine_rate(struct clk_hw *hw,
                val = readl(reg_addr) >> div->shift;
                val &= clk_div_mask(div->width);
 
-               req->rate = divider_ro_round_rate(hw, req->rate,
-                                                 &req->best_parent_rate,
-                                                 div->table,
-                                                 div->width, div->flags, val);
-
-               return 0;
+               return divider_ro_determine_rate(hw, req, div->table,
+                                                div->width, div->flags, val);
        }
 
        req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,