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 <bmas...@redhat.com>
---
 drivers/gpu/drm/sun4i/sun4i_tcon_dclk.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon_dclk.c 
b/drivers/gpu/drm/sun4i/sun4i_tcon_dclk.c
index 
03d7de1911cd654f395ea85ad914588c4351f391..9b85bf512d4c81d0a12e8cf726d5d5440343519c
 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tcon_dclk.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon_dclk.c
@@ -67,8 +67,8 @@ static unsigned long sun4i_dclk_recalc_rate(struct clk_hw *hw,
        return parent_rate / val;
 }
 
-static long sun4i_dclk_round_rate(struct clk_hw *hw, unsigned long rate,
-                                 unsigned long *parent_rate)
+static int sun4i_dclk_determine_rate(struct clk_hw *hw,
+                                    struct clk_rate_request *req)
 {
        struct sun4i_dclk *dclk = hw_to_dclk(hw);
        struct sun4i_tcon *tcon = dclk->tcon;
@@ -77,7 +77,7 @@ static long sun4i_dclk_round_rate(struct clk_hw *hw, unsigned 
long rate,
        int i;
 
        for (i = tcon->dclk_min_div; i <= tcon->dclk_max_div; i++) {
-               u64 ideal = (u64)rate * i;
+               u64 ideal = (u64) req->rate * i;
                unsigned long rounded;
 
                /*
@@ -99,17 +99,19 @@ static long sun4i_dclk_round_rate(struct clk_hw *hw, 
unsigned long rate,
                        goto out;
                }
 
-               if (abs(rate - rounded / i) <
-                   abs(rate - best_parent / best_div)) {
+               if (abs(req->rate - rounded / i) <
+                   abs(req->rate - best_parent / best_div)) {
                        best_parent = rounded;
                        best_div = i;
                }
        }
 
 out:
-       *parent_rate = best_parent;
+       req->best_parent_rate = best_parent;
 
-       return best_parent / best_div;
+       req->rate = best_parent / best_div;
+
+       return 0;
 }
 
 static int sun4i_dclk_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -155,7 +157,7 @@ static const struct clk_ops sun4i_dclk_ops = {
        .is_enabled     = sun4i_dclk_is_enabled,
 
        .recalc_rate    = sun4i_dclk_recalc_rate,
-       .round_rate     = sun4i_dclk_round_rate,
+       .determine_rate = sun4i_dclk_determine_rate,
        .set_rate       = sun4i_dclk_set_rate,
 
        .get_phase      = sun4i_dclk_get_phase,

-- 
2.50.0

Reply via email to