]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/msm/hdmi_phy_8996: convert from round_rate() to determine_rate()
authorBrian Masney <bmasney@redhat.com>
Sun, 10 Aug 2025 22:57:30 +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/667876/
Link: https://lore.kernel.org/r/20250810-drm-msm-phy-clk-round-rate-v2-6-0fd1f7979c83@redhat.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c

index 8c8d80b59573a37a4008752b16e094a218802508..36e928b0fd5a319b6a12b9be52705c067d51c20b 100644 (file)
@@ -629,16 +629,12 @@ static int hdmi_8996_pll_prepare(struct clk_hw *hw)
        return 0;
 }
 
-static long hdmi_8996_pll_round_rate(struct clk_hw *hw,
-                                    unsigned long rate,
-                                    unsigned long *parent_rate)
+static int hdmi_8996_pll_determine_rate(struct clk_hw *hw,
+                                       struct clk_rate_request *req)
 {
-       if (rate < HDMI_PCLK_MIN_FREQ)
-               return HDMI_PCLK_MIN_FREQ;
-       else if (rate > HDMI_PCLK_MAX_FREQ)
-               return HDMI_PCLK_MAX_FREQ;
-       else
-               return rate;
+       req->rate = clamp_t(unsigned long, req->rate, HDMI_PCLK_MIN_FREQ, HDMI_PCLK_MAX_FREQ);
+
+       return 0;
 }
 
 static unsigned long hdmi_8996_pll_recalc_rate(struct clk_hw *hw,
@@ -684,7 +680,7 @@ static int hdmi_8996_pll_is_enabled(struct clk_hw *hw)
 
 static const struct clk_ops hdmi_8996_pll_ops = {
        .set_rate = hdmi_8996_pll_set_clk_rate,
-       .round_rate = hdmi_8996_pll_round_rate,
+       .determine_rate = hdmi_8996_pll_determine_rate,
        .recalc_rate = hdmi_8996_pll_recalc_rate,
        .prepare = hdmi_8996_pll_prepare,
        .unprepare = hdmi_8996_pll_unprepare,