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/phy/rockchip/phy-rockchip-inno-hdmi.c | 30 ++++++++++++++-------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c 
b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c
index 
8dcc2bb777b5455d21a10f06c5ad842b2ddbc834..1483907413faa5ce1dc8614db05e6e929410404d
 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c
@@ -749,22 +749,23 @@ unsigned long inno_hdmi_phy_rk3228_clk_recalc_rate(struct 
clk_hw *hw,
        return vco;
 }
 
-static long inno_hdmi_phy_rk3228_clk_round_rate(struct clk_hw *hw,
-                                               unsigned long rate,
-                                               unsigned long *parent_rate)
+static int inno_hdmi_phy_rk3228_clk_determine_rate(struct clk_hw *hw,
+                                                  struct clk_rate_request *req)
 {
        const struct pre_pll_config *cfg = pre_pll_cfg_table;
 
-       rate = (rate / 1000) * 1000;
+       req->rate = (req->rate / 1000) * 1000;
 
        for (; cfg->pixclock != 0; cfg++)
-               if (cfg->pixclock == rate && !cfg->fracdiv)
+               if (cfg->pixclock == req->rate && !cfg->fracdiv)
                        break;
 
        if (cfg->pixclock == 0)
                return -EINVAL;
 
-       return cfg->pixclock;
+       req->rate = cfg->pixclock;
+
+       return 0;
 }
 
 static int inno_hdmi_phy_rk3228_clk_set_rate(struct clk_hw *hw,
@@ -835,7 +836,7 @@ static const struct clk_ops inno_hdmi_phy_rk3228_clk_ops = {
        .unprepare = inno_hdmi_phy_rk3228_clk_unprepare,
        .is_prepared = inno_hdmi_phy_rk3228_clk_is_prepared,
        .recalc_rate = inno_hdmi_phy_rk3228_clk_recalc_rate,
-       .round_rate = inno_hdmi_phy_rk3228_clk_round_rate,
+       .determine_rate = inno_hdmi_phy_rk3228_clk_determine_rate,
        .set_rate = inno_hdmi_phy_rk3228_clk_set_rate,
 };
 
@@ -906,22 +907,23 @@ unsigned long inno_hdmi_phy_rk3328_clk_recalc_rate(struct 
clk_hw *hw,
        return inno->pixclock;
 }
 
-static long inno_hdmi_phy_rk3328_clk_round_rate(struct clk_hw *hw,
-                                               unsigned long rate,
-                                               unsigned long *parent_rate)
+static int inno_hdmi_phy_rk3328_clk_determine_rate(struct clk_hw *hw,
+                                                  struct clk_rate_request *req)
 {
        const struct pre_pll_config *cfg = pre_pll_cfg_table;
 
-       rate = (rate / 1000) * 1000;
+       req->rate = (req->rate / 1000) * 1000;
 
        for (; cfg->pixclock != 0; cfg++)
-               if (cfg->pixclock == rate)
+               if (cfg->pixclock == req->rate)
                        break;
 
        if (cfg->pixclock == 0)
                return -EINVAL;
 
-       return cfg->pixclock;
+       req->rate = cfg->pixclock;
+
+       return 0;
 }
 
 static int inno_hdmi_phy_rk3328_clk_set_rate(struct clk_hw *hw,
@@ -989,7 +991,7 @@ static const struct clk_ops inno_hdmi_phy_rk3328_clk_ops = {
        .unprepare = inno_hdmi_phy_rk3328_clk_unprepare,
        .is_prepared = inno_hdmi_phy_rk3328_clk_is_prepared,
        .recalc_rate = inno_hdmi_phy_rk3328_clk_recalc_rate,
-       .round_rate = inno_hdmi_phy_rk3328_clk_round_rate,
+       .determine_rate = inno_hdmi_phy_rk3328_clk_determine_rate,
        .set_rate = inno_hdmi_phy_rk3328_clk_set_rate,
 };
 

-- 
2.50.0

Reply via email to