clk: rockchip: pll: 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/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c
index c9d599c31923fc6a7f6a25a2296cd5853c881c60..86dba3826a77ef303c18c5a7b1ea1a54531786be 100644 (file)
--- a/drivers/clk/rockchip/clk-pll.c
+++ b/drivers/clk/rockchip/clk-pll.c
@@ -61,8 +61,8 @@ static const struct rockchip_pll_rate_table *rockchip_get_pll_settings(
        return NULL;
 }
 
-static long rockchip_pll_round_rate(struct clk_hw *hw,
-                           unsigned long drate, unsigned long *prate)
+static int rockchip_pll_determine_rate(struct clk_hw *hw,
+                                      struct clk_rate_request *req)
 {
        struct rockchip_clk_pll *pll = to_rockchip_clk_pll(hw);
        const struct rockchip_pll_rate_table *rate_table = pll->rate_table;
@@ -70,12 +70,17 @@ static long rockchip_pll_round_rate(struct clk_hw *hw,
 
        /* Assuming rate_table is in descending order */
        for (i = 0; i < pll->rate_count; i++) {
-               if (drate >= rate_table[i].rate)
-                       return rate_table[i].rate;
+               if (req->rate >= rate_table[i].rate) {
+                       req->rate = rate_table[i].rate;
+
+                       return 0;
+               }
        }
 
        /* return minimum supported value */
-       return rate_table[i - 1].rate;
+       req->rate = rate_table[i - 1].rate;
+
+       return 0;
 }
 
 /*
@@ -352,7 +357,7 @@ static const struct clk_ops rockchip_rk3036_pll_clk_norate_ops = {
 
 static const struct clk_ops rockchip_rk3036_pll_clk_ops = {
        .recalc_rate = rockchip_rk3036_pll_recalc_rate,
-       .round_rate = rockchip_pll_round_rate,
+       .determine_rate = rockchip_pll_determine_rate,
        .set_rate = rockchip_rk3036_pll_set_rate,
        .enable = rockchip_rk3036_pll_enable,
        .disable = rockchip_rk3036_pll_disable,
@@ -571,7 +576,7 @@ static const struct clk_ops rockchip_rk3066_pll_clk_norate_ops = {
 
 static const struct clk_ops rockchip_rk3066_pll_clk_ops = {
        .recalc_rate = rockchip_rk3066_pll_recalc_rate,
-       .round_rate = rockchip_pll_round_rate,
+       .determine_rate = rockchip_pll_determine_rate,
        .set_rate = rockchip_rk3066_pll_set_rate,
        .enable = rockchip_rk3066_pll_enable,
        .disable = rockchip_rk3066_pll_disable,
@@ -836,7 +841,7 @@ static const struct clk_ops rockchip_rk3399_pll_clk_norate_ops = {
 
 static const struct clk_ops rockchip_rk3399_pll_clk_ops = {
        .recalc_rate = rockchip_rk3399_pll_recalc_rate,
-       .round_rate = rockchip_pll_round_rate,
+       .determine_rate = rockchip_pll_determine_rate,
        .set_rate = rockchip_rk3399_pll_set_rate,
        .enable = rockchip_rk3399_pll_enable,
        .disable = rockchip_rk3399_pll_disable,
@@ -1036,7 +1041,7 @@ static const struct clk_ops rockchip_rk3588_pll_clk_norate_ops = {
 
 static const struct clk_ops rockchip_rk3588_pll_clk_ops = {
        .recalc_rate = rockchip_rk3588_pll_recalc_rate,
-       .round_rate = rockchip_pll_round_rate,
+       .determine_rate = rockchip_pll_determine_rate,
        .set_rate = rockchip_rk3588_pll_set_rate,
        .enable = rockchip_rk3588_pll_enable,
        .disable = rockchip_rk3588_pll_disable,