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

index 6e03b69d402848b237154319d2296ffb4133a213..25efb5b3760759f2943737856246ce93000ebf05 100644 (file)
@@ -127,20 +127,20 @@ static unsigned long ccu_nkmp_recalc_rate(struct clk_hw *hw,
        return rate;
 }
 
-static long ccu_nkmp_round_rate(struct clk_hw *hw, unsigned long rate,
-                             unsigned long *parent_rate)
+static int ccu_nkmp_determine_rate(struct clk_hw *hw,
+                                  struct clk_rate_request *req)
 {
        struct ccu_nkmp *nkmp = hw_to_ccu_nkmp(hw);
        struct _ccu_nkmp _nkmp;
 
        if (nkmp->common.features & CCU_FEATURE_FIXED_POSTDIV)
-               rate *= nkmp->fixed_post_div;
+               req->rate *= nkmp->fixed_post_div;
 
-       if (nkmp->max_rate && rate > nkmp->max_rate) {
-               rate = nkmp->max_rate;
+       if (nkmp->max_rate && req->rate > nkmp->max_rate) {
+               req->rate = nkmp->max_rate;
                if (nkmp->common.features & CCU_FEATURE_FIXED_POSTDIV)
-                       rate /= nkmp->fixed_post_div;
-               return rate;
+                       req->rate /= nkmp->fixed_post_div;
+               return 0;
        }
 
        _nkmp.min_n = nkmp->n.min ?: 1;
@@ -152,12 +152,13 @@ static long ccu_nkmp_round_rate(struct clk_hw *hw, unsigned long rate,
        _nkmp.min_p = 1;
        _nkmp.max_p = nkmp->p.max ?: 1 << ((1 << nkmp->p.width) - 1);
 
-       rate = ccu_nkmp_find_best(*parent_rate, rate, &_nkmp);
+       req->rate = ccu_nkmp_find_best(req->best_parent_rate, req->rate,
+                                      &_nkmp);
 
        if (nkmp->common.features & CCU_FEATURE_FIXED_POSTDIV)
-               rate = rate / nkmp->fixed_post_div;
+               req->rate = req->rate / nkmp->fixed_post_div;
 
-       return rate;
+       return 0;
 }
 
 static int ccu_nkmp_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -227,7 +228,7 @@ const struct clk_ops ccu_nkmp_ops = {
        .is_enabled     = ccu_nkmp_is_enabled,
 
        .recalc_rate    = ccu_nkmp_recalc_rate,
-       .round_rate     = ccu_nkmp_round_rate,
+       .determine_rate = ccu_nkmp_determine_rate,
        .set_rate       = ccu_nkmp_set_rate,
 };
 EXPORT_SYMBOL_NS_GPL(ccu_nkmp_ops, "SUNXI_CCU");