]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
clk: sunxi-ng: ccu_gate: convert from round_rate() to determine_rate()
authorBrian Masney <bmasney@redhat.com>
Thu, 3 Jul 2025 23:22:31 +0000 (19:22 -0400)
committerChen-Yu Tsai <wens@csie.org>
Mon, 14 Jul 2025 03:56:17 +0000 (11:56 +0800)
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>
Reviewed-by: Maxime Ripard <mripard@kernel.org>
Link: https://patch.msgid.link/20250703-clk-cocci-drop-round-rate-v1-7-3a8da898367e@redhat.com
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
drivers/clk/sunxi-ng/ccu_gate.c

index 474a9e8831f87ffcec7712c14ecb55b8523f05a6..30673fe4e3c2cd2c86f94a21929b144ba4cf01fe 100644 (file)
@@ -91,8 +91,8 @@ static unsigned long ccu_gate_recalc_rate(struct clk_hw *hw,
        return rate;
 }
 
-static long ccu_gate_round_rate(struct clk_hw *hw, unsigned long rate,
-                               unsigned long *prate)
+static int ccu_gate_determine_rate(struct clk_hw *hw,
+                                  struct clk_rate_request *req)
 {
        struct ccu_gate *cg = hw_to_ccu_gate(hw);
        int div = 1;
@@ -101,14 +101,16 @@ static long ccu_gate_round_rate(struct clk_hw *hw, unsigned long rate,
                div = cg->common.prediv;
 
        if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) {
-               unsigned long best_parent = rate;
+               unsigned long best_parent = req->rate;
 
                if (cg->common.features & CCU_FEATURE_ALL_PREDIV)
                        best_parent *= div;
-               *prate = clk_hw_round_rate(clk_hw_get_parent(hw), best_parent);
+               req->best_parent_rate = clk_hw_round_rate(clk_hw_get_parent(hw), best_parent);
        }
 
-       return *prate / div;
+       req->rate = req->best_parent_rate / div;
+
+       return 0;
 }
 
 static int ccu_gate_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -127,7 +129,7 @@ const struct clk_ops ccu_gate_ops = {
        .disable        = ccu_gate_disable,
        .enable         = ccu_gate_enable,
        .is_enabled     = ccu_gate_is_enabled,
-       .round_rate     = ccu_gate_round_rate,
+       .determine_rate = ccu_gate_determine_rate,
        .set_rate       = ccu_gate_set_rate,
        .recalc_rate    = ccu_gate_recalc_rate,
 };