clk: mmp: frac: convert from round_rate() to determine_rate()

The round_rate() clk ops is deprecated, so migrate this driver from
round_rate() to determine_rate() using the Coccinelle semantic patch
on the cover letter of this series.

Signed-off-by: Brian Masney <bmasney@redhat.com>

diff --git a/drivers/clk/mmp/clk-frac.c b/drivers/clk/mmp/clk-frac.c
index 6556f6ada2e830178b9525462f684bad683db454..0b1bb01346f0d7b450e85b805f6c84da6f803f56 100644 (file)
--- a/drivers/clk/mmp/clk-frac.c
+++ b/drivers/clk/mmp/clk-frac.c
@@ -21,8 +21,8 @@
 
 #define to_clk_factor(hw) container_of(hw, struct mmp_clk_factor, hw)
 
-static long clk_factor_round_rate(struct clk_hw *hw, unsigned long drate,
-               unsigned long *prate)
+static int clk_factor_determine_rate(struct clk_hw *hw,
+                                    struct clk_rate_request *req)
 {
        struct mmp_clk_factor *factor = to_clk_factor(hw);
        u64 rate = 0, prev_rate;
@@ -33,19 +33,20 @@ static long clk_factor_round_rate(struct clk_hw *hw, unsigned long drate,
                d = &factor->ftbl[i];
 
                prev_rate = rate;
-               rate = (u64)(*prate) * d->denominator;
+               rate = (u64)(req->best_parent_rate) * d->denominator;
                do_div(rate, d->numerator * factor->masks->factor);
-               if (rate > drate)
+               if (rate > req->rate)
                        break;
        }
-       if ((i == 0) || (i == factor->ftbl_cnt)) {
-               return rate;
-       } else {
-               if ((drate - prev_rate) > (rate - drate))
-                       return rate;
-               else
-                       return prev_rate;
-       }
+
+       if ((i == 0) || (i == factor->ftbl_cnt))
+               req->rate = rate;
+       else if ((req->rate - prev_rate) > (rate - req->rate))
+               req->rate = rate;
+       else
+               req->rate = prev_rate;
+
+       return 0;
 }
 
 static unsigned long clk_factor_recalc_rate(struct clk_hw *hw,
@@ -160,7 +161,7 @@ static int clk_factor_init(struct clk_hw *hw)
 
 static const struct clk_ops clk_factor_ops = {
        .recalc_rate = clk_factor_recalc_rate,
-       .round_rate = clk_factor_round_rate,
+       .determine_rate = clk_factor_determine_rate,
        .set_rate = clk_factor_set_rate,
        .init = clk_factor_init,
 };