[PATCH v2 2/7] drm/msm/dsi_phy_14nm: convert from round_rate() to determine_rate()

[Brian Masney]

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. The change to use clamp_t() was
done manually.

Signed-off-by: Brian Masney <bmas...@redhat.com>
---
 drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 34 +++++++++++++++---------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c 
b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
index 
3a1c8ece6657c988cfb0c26af39b5d145bc576f8..fdefcbd9c2848a1c76414a41b811b29e5fed9ddc
 100644
--- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
+++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
@@ -578,21 +578,19 @@ static void dsi_pll_14nm_vco_unprepare(struct clk_hw *hw)
        pll_14nm->phy->pll_on = false;
 }
 
-static long dsi_pll_14nm_clk_round_rate(struct clk_hw *hw,
-               unsigned long rate, unsigned long *parent_rate)
+static int dsi_pll_14nm_clk_determine_rate(struct clk_hw *hw,
+                                          struct clk_rate_request *req)
 {
        struct dsi_pll_14nm *pll_14nm = to_pll_14nm(hw);
 
-       if      (rate < pll_14nm->phy->cfg->min_pll_rate)
-               return  pll_14nm->phy->cfg->min_pll_rate;
-       else if (rate > pll_14nm->phy->cfg->max_pll_rate)
-               return  pll_14nm->phy->cfg->max_pll_rate;
-       else
-               return rate;
+       req->rate = clamp_t(unsigned long, req->rate,
+                           pll_14nm->phy->cfg->min_pll_rate, 
pll_14nm->phy->cfg->max_pll_rate);
+
+       return 0;
 }
 
 static const struct clk_ops clk_ops_dsi_pll_14nm_vco = {
-       .round_rate = dsi_pll_14nm_clk_round_rate,
+       .determine_rate = dsi_pll_14nm_clk_determine_rate,
        .set_rate = dsi_pll_14nm_vco_set_rate,
        .recalc_rate = dsi_pll_14nm_vco_recalc_rate,
        .prepare = dsi_pll_14nm_vco_prepare,
@@ -622,18 +620,20 @@ static unsigned long 
dsi_pll_14nm_postdiv_recalc_rate(struct clk_hw *hw,
                                   postdiv->flags, width);
 }
 
-static long dsi_pll_14nm_postdiv_round_rate(struct clk_hw *hw,
-                                           unsigned long rate,
-                                           unsigned long *prate)
+static int dsi_pll_14nm_postdiv_determine_rate(struct clk_hw *hw,
+                                              struct clk_rate_request *req)
 {
        struct dsi_pll_14nm_postdiv *postdiv = to_pll_14nm_postdiv(hw);
        struct dsi_pll_14nm *pll_14nm = postdiv->pll;
 
-       DBG("DSI%d PLL parent rate=%lu", pll_14nm->phy->id, rate);
+       DBG("DSI%d PLL parent rate=%lu", pll_14nm->phy->id, req->rate);
 
-       return divider_round_rate(hw, rate, prate, NULL,
-                                 postdiv->width,
-                                 postdiv->flags);
+       req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
+                                      NULL,
+                                      postdiv->width,
+                                      postdiv->flags);
+
+       return 0;
 }
 
 static int dsi_pll_14nm_postdiv_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -680,7 +680,7 @@ static int dsi_pll_14nm_postdiv_set_rate(struct clk_hw *hw, 
unsigned long rate,
 
 static const struct clk_ops clk_ops_dsi_pll_14nm_postdiv = {
        .recalc_rate = dsi_pll_14nm_postdiv_recalc_rate,
-       .round_rate = dsi_pll_14nm_postdiv_round_rate,
+       .determine_rate = dsi_pll_14nm_postdiv_determine_rate,
        .set_rate = dsi_pll_14nm_postdiv_set_rate,
 };
 

-- 
2.50.1