]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/msm/dsi_phy_7nm: convert from round_rate() to determine_rate()
authorBrian Masney <bmasney@redhat.com>
Sun, 10 Aug 2025 22:57:29 +0000 (18:57 -0400)
committerDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Thu, 28 Aug 2025 22:51:46 +0000 (01:51 +0300)
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 <bmasney@redhat.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/667874/
Link: https://lore.kernel.org/r/20250810-drm-msm-phy-clk-round-rate-v2-5-0fd1f7979c83@redhat.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c

index 8c98f91a5930c9f2563a6b4824690ceef56987c0..c3bd3f89434eb7d3d0f3bb9455d22aa00915e797 100644 (file)
@@ -561,21 +561,19 @@ static unsigned long dsi_pll_7nm_vco_recalc_rate(struct clk_hw *hw,
        return (unsigned long)vco_rate;
 }
 
-static long dsi_pll_7nm_clk_round_rate(struct clk_hw *hw,
-               unsigned long rate, unsigned long *parent_rate)
+static int dsi_pll_7nm_clk_determine_rate(struct clk_hw *hw,
+                                         struct clk_rate_request *req)
 {
        struct dsi_pll_7nm *pll_7nm = to_pll_7nm(hw);
 
-       if      (rate < pll_7nm->phy->cfg->min_pll_rate)
-               return  pll_7nm->phy->cfg->min_pll_rate;
-       else if (rate > pll_7nm->phy->cfg->max_pll_rate)
-               return  pll_7nm->phy->cfg->max_pll_rate;
-       else
-               return rate;
+       req->rate = clamp_t(unsigned long, req->rate,
+                           pll_7nm->phy->cfg->min_pll_rate, pll_7nm->phy->cfg->max_pll_rate);
+
+       return 0;
 }
 
 static const struct clk_ops clk_ops_dsi_pll_7nm_vco = {
-       .round_rate = dsi_pll_7nm_clk_round_rate,
+       .determine_rate = dsi_pll_7nm_clk_determine_rate,
        .set_rate = dsi_pll_7nm_vco_set_rate,
        .recalc_rate = dsi_pll_7nm_vco_recalc_rate,
        .prepare = dsi_pll_7nm_vco_prepare,