]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
clk: sunxi-ng: ccu_nk: convert from round_rate() to determine_rate()
authorBrian Masney <bmasney@redhat.com>
Thu, 3 Jul 2025 23:22:32 +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-8-3a8da898367e@redhat.com
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
drivers/clk/sunxi-ng/ccu_nk.c

index 555e99de2cc6ee0c84ccaaac9ee83be2d88741a0..5db748fbb5bd9399a2d551c8821a4bb17ded005a 100644 (file)
@@ -92,26 +92,26 @@ static unsigned long ccu_nk_recalc_rate(struct clk_hw *hw,
        return rate;
 }
 
-static long ccu_nk_round_rate(struct clk_hw *hw, unsigned long rate,
-                             unsigned long *parent_rate)
+static int ccu_nk_determine_rate(struct clk_hw *hw,
+                                struct clk_rate_request *req)
 {
        struct ccu_nk *nk = hw_to_ccu_nk(hw);
        struct _ccu_nk _nk;
 
        if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV)
-               rate *= nk->fixed_post_div;
+               req->rate *= nk->fixed_post_div;
 
        _nk.min_n = nk->n.min ?: 1;
        _nk.max_n = nk->n.max ?: 1 << nk->n.width;
        _nk.min_k = nk->k.min ?: 1;
        _nk.max_k = nk->k.max ?: 1 << nk->k.width;
 
-       rate = ccu_nk_find_best(*parent_rate, rate, &_nk);
+       req->rate = ccu_nk_find_best(req->best_parent_rate, req->rate, &_nk);
 
        if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV)
-               rate = rate / nk->fixed_post_div;
+               req->rate = req->rate / nk->fixed_post_div;
 
-       return rate;
+       return 0;
 }
 
 static int ccu_nk_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -155,7 +155,7 @@ const struct clk_ops ccu_nk_ops = {
        .is_enabled     = ccu_nk_is_enabled,
 
        .recalc_rate    = ccu_nk_recalc_rate,
-       .round_rate     = ccu_nk_round_rate,
+       .determine_rate = ccu_nk_determine_rate,
        .set_rate       = ccu_nk_set_rate,
 };
 EXPORT_SYMBOL_NS_GPL(ccu_nk_ops, "SUNXI_CCU");