clk: cdce925: 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/clk-cdce925.c b/drivers/clk/clk-cdce925.c
index c51818c1af982619265306bbd418929a948a4c72..0b2ad21e6e4d34ea1297de489b2e226ff2af40c4 100644 (file)
--- a/drivers/clk/clk-cdce925.c
+++ b/drivers/clk/clk-cdce925.c
@@ -128,13 +128,15 @@ static void cdce925_pll_find_rate(unsigned long rate,
        }
 }
 
-static long cdce925_pll_round_rate(struct clk_hw *hw, unsigned long rate,
-               unsigned long *parent_rate)
+static int cdce925_pll_determine_rate(struct clk_hw *hw,
+                                     struct clk_rate_request *req)
 {
        u16 n, m;
 
-       cdce925_pll_find_rate(rate, *parent_rate, &n, &m);
-       return (long)cdce925_pll_calculate_rate(*parent_rate, n, m);
+       cdce925_pll_find_rate(req->rate, req->best_parent_rate, &n, &m);
+       req->rate = (long)cdce925_pll_calculate_rate(req->best_parent_rate, n, m);
+
+       return 0;
 }
 
 static int cdce925_pll_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -266,7 +268,7 @@ static const struct clk_ops cdce925_pll_ops = {
        .prepare = cdce925_pll_prepare,
        .unprepare = cdce925_pll_unprepare,
        .recalc_rate = cdce925_pll_recalc_rate,
-       .round_rate = cdce925_pll_round_rate,
+       .determine_rate = cdce925_pll_determine_rate,
        .set_rate = cdce925_pll_set_rate,
 };
 
@@ -420,20 +422,23 @@ static unsigned long cdce925_clk_best_parent_rate(
        return rate * pdiv_best;
 }
 
-static long cdce925_clk_round_rate(struct clk_hw *hw, unsigned long rate,
-               unsigned long *parent_rate)
+static int cdce925_clk_determine_rate(struct clk_hw *hw,
+                                     struct clk_rate_request *req)
 {
-       unsigned long l_parent_rate = *parent_rate;
-       u16 divider = cdce925_calc_divider(rate, l_parent_rate);
+       unsigned long l_parent_rate = req->best_parent_rate;
+       u16 divider = cdce925_calc_divider(req->rate, l_parent_rate);
 
-       if (l_parent_rate / divider != rate) {
-               l_parent_rate = cdce925_clk_best_parent_rate(hw, rate);
-               divider = cdce925_calc_divider(rate, l_parent_rate);
-               *parent_rate = l_parent_rate;
+       if (l_parent_rate / divider != req->rate) {
+               l_parent_rate = cdce925_clk_best_parent_rate(hw, req->rate);
+               divider = cdce925_calc_divider(req->rate, l_parent_rate);
+               req->best_parent_rate = l_parent_rate;
        }
 
        if (divider)
-               return (long)(l_parent_rate / divider);
+               req->rate = (long)(l_parent_rate / divider);
+       else
+               req->rate = 0;
+
        return 0;
 }
 
@@ -451,7 +456,7 @@ static const struct clk_ops cdce925_clk_ops = {
        .prepare = cdce925_clk_prepare,
        .unprepare = cdce925_clk_unprepare,
        .recalc_rate = cdce925_clk_recalc_rate,
-       .round_rate = cdce925_clk_round_rate,
+       .determine_rate = cdce925_clk_determine_rate,
        .set_rate = cdce925_clk_set_rate,
 };
 
@@ -473,14 +478,17 @@ static u16 cdce925_y1_calc_divider(unsigned long rate,
        return (u16)divider;
 }
 
-static long cdce925_clk_y1_round_rate(struct clk_hw *hw, unsigned long rate,
-               unsigned long *parent_rate)
+static int cdce925_clk_y1_determine_rate(struct clk_hw *hw,
+                                        struct clk_rate_request *req)
 {
-       unsigned long l_parent_rate = *parent_rate;
-       u16 divider = cdce925_y1_calc_divider(rate, l_parent_rate);
+       unsigned long l_parent_rate = req->best_parent_rate;
+       u16 divider = cdce925_y1_calc_divider(req->rate, l_parent_rate);
 
        if (divider)
-               return (long)(l_parent_rate / divider);
+               req->rate = (long)(l_parent_rate / divider);
+       else
+               req->rate = 0;
+
        return 0;
 }
 
@@ -498,7 +506,7 @@ static const struct clk_ops cdce925_clk_y1_ops = {
        .prepare = cdce925_clk_prepare,
        .unprepare = cdce925_clk_unprepare,
        .recalc_rate = cdce925_clk_recalc_rate,
-       .round_rate = cdce925_clk_y1_round_rate,
+       .determine_rate = cdce925_clk_y1_determine_rate,
        .set_rate = cdce925_clk_y1_set_rate,
 };