clk: sophgo: sg2042-clkgen: 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.

Note that this commit also removes a debugging message that's not really
needed.

Fixes: 9a3b6993613d ("clk: sophgo: sg2042-clkgen: convert from round_rate() to determine_rate()")
Tested-by: Chen Wang <unicorn_wang@outlook.com>
Reviewed-by: Chen Wang <unicorn_wang@outlook.com>
Signed-off-by: Brian Masney <bmasney@redhat.com>

diff --git a/drivers/clk/sophgo/clk-sg2042-clkgen.c b/drivers/clk/sophgo/clk-sg2042-clkgen.c
index 683661b71787c9e5428b168502f6fbb30ea9f7da..9725ac4e050a4e6afd3fd50241fbd2fc105a31ca 100644 (file)
--- a/drivers/clk/sophgo/clk-sg2042-clkgen.c
+++ b/drivers/clk/sophgo/clk-sg2042-clkgen.c
@@ -180,7 +180,6 @@ static int sg2042_clk_divider_determine_rate(struct clk_hw *hw,
                                             struct clk_rate_request *req)
 {
        struct sg2042_divider_clock *divider = to_sg2042_clk_divider(hw);
-       unsigned long ret_rate;
        u32 bestdiv;
 
        /* if read only, just return current value */
@@ -191,17 +190,13 @@ static int sg2042_clk_divider_determine_rate(struct clk_hw *hw,
                        bestdiv = readl(divider->reg) >> divider->shift;
                        bestdiv &= clk_div_mask(divider->width);
                }
-               ret_rate = DIV_ROUND_UP_ULL((u64)req->best_parent_rate, bestdiv);
-       } else {
-               ret_rate = divider_round_rate(hw, req->rate, &req->best_parent_rate, NULL,
-                                             divider->width, divider->div_flags);
-       }
+               req->rate = DIV_ROUND_UP_ULL((u64)req->best_parent_rate, bestdiv);
 
-       pr_debug("--> %s: divider_round_rate: val = %ld\n",
-                clk_hw_get_name(hw), ret_rate);
-       req->rate = ret_rate;
+               return 0;
+       }
 
-       return 0;
+       return divider_determine_rate(hw, req, NULL, divider->width,
+                                     divider->div_flags);
 }
 
 static int sg2042_clk_divider_set_rate(struct clk_hw *hw,