clk: stm32: stm32-core: convert from divider_ro_round_rate() to divider_ro_determine_...

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: cd1cb38836c0 ("clk: stm32: stm32-core: convert from round_rate() to determine_rate()")
Signed-off-by: Brian Masney <bmasney@redhat.com>

diff --git a/drivers/clk/stm32/clk-stm32-core.c b/drivers/clk/stm32/clk-stm32-core.c
index 72825b9c36a4d3b8ba3f7615b9026c09ffaf88d1..b95b9c591fda7d900d523f50c8bd449398aba49f 100644 (file)
--- a/drivers/clk/stm32/clk-stm32-core.c
+++ b/drivers/clk/stm32/clk-stm32-core.c
@@ -369,13 +369,10 @@ static int clk_stm32_divider_determine_rate(struct clk_hw *hw,
                val =  readl(div->base + divider->offset) >> divider->shift;
                val &= clk_div_mask(divider->width);
 
-               req->rate = divider_ro_round_rate(hw, req->rate,
-                                                 &req->best_parent_rate,
-                                                 divider->table,
-                                                 divider->width,
-                                                 divider->flags, val);
-
-               return 0;
+               return divider_ro_determine_rate(hw, req,
+                                                divider->table,
+                                                divider->width,
+                                                divider->flags, val);
        }
 
        req->rate = divider_round_rate_parent(hw, clk_hw_get_parent(hw),
@@ -455,14 +452,9 @@ static int clk_stm32_composite_determine_rate(struct clk_hw *hw,
                val =  readl(composite->base + divider->offset) >> divider->shift;
                val &= clk_div_mask(divider->width);
 
-               rate = divider_ro_round_rate(hw, req->rate, &req->best_parent_rate,
-                                            divider->table, divider->width, divider->flags,
-                                            val);
-               if (rate < 0)
-                       return rate;
-
-               req->rate = rate;
-               return 0;
+               return divider_ro_determine_rate(hw, req, divider->table,
+                                                divider->width, divider->flags,
+                                                val);
        }
 
        rate = divider_round_rate_parent(hw, clk_hw_get_parent(hw),