clocksource/drivers/ingenic-sysost: Convert from round_rate() to determine_rate()
authorBrian Masney <bmasney@redhat.com>
Sun, 10 Aug 2025 22:37:10 +0000 (18:37 -0400)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Tue, 23 Sep 2025 10:41:50 +0000 (12:41 +0200)
The round_rate() clk ops is deprecated, so migrate this driver from
round_rate() to determine_rate() using the Coccinelle semantic patch
appended to the "under-the-cut" portion of the patch.

While changes are being made to 'struct clk_ops', let's also go ahead
and fix the formatting of set_rate so that everything lines up as
expected.

Signed-off-by: Brian Masney <bmasney@redhat.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20250810-clocksource-round-rate-v1-1-486ef53e45eb@redhat.com
drivers/clocksource/ingenic-sysost.c

index cb6fc2f..e79cfb0 100644 (file)
@@ -127,18 +127,23 @@ static u8 ingenic_ost_get_prescale(unsigned long rate, unsigned long req_rate)
        return 2; /* /16 divider */
 }
 
-static long ingenic_ost_round_rate(struct clk_hw *hw, unsigned long req_rate,
-               unsigned long *parent_rate)
+static int ingenic_ost_determine_rate(struct clk_hw *hw,
+                                     struct clk_rate_request *req)
 {
-       unsigned long rate = *parent_rate;
+       unsigned long rate = req->best_parent_rate;
        u8 prescale;
 
-       if (req_rate > rate)
-               return rate;
+       if (req->rate > rate) {
+               req->rate = rate;
 
-       prescale = ingenic_ost_get_prescale(rate, req_rate);
+               return 0;
+       }
+
+       prescale = ingenic_ost_get_prescale(rate, req->rate);
 
-       return rate >> (prescale * 2);
+       req->rate = rate >> (prescale * 2);
+
+       return 0;
 }
 
 static int ingenic_ost_percpu_timer_set_rate(struct clk_hw *hw, unsigned long req_rate,
@@ -175,14 +180,14 @@ static int ingenic_ost_global_timer_set_rate(struct clk_hw *hw, unsigned long re
 
 static const struct clk_ops ingenic_ost_percpu_timer_ops = {
        .recalc_rate    = ingenic_ost_percpu_timer_recalc_rate,
-       .round_rate             = ingenic_ost_round_rate,
-       .set_rate               = ingenic_ost_percpu_timer_set_rate,
+       .determine_rate = ingenic_ost_determine_rate,
+       .set_rate       = ingenic_ost_percpu_timer_set_rate,
 };
 
 static const struct clk_ops ingenic_ost_global_timer_ops = {
        .recalc_rate    = ingenic_ost_global_timer_recalc_rate,
-       .round_rate             = ingenic_ost_round_rate,
-       .set_rate               = ingenic_ost_global_timer_set_rate,
+       .determine_rate = ingenic_ost_determine_rate,
+       .set_rate       = ingenic_ost_global_timer_set_rate,
 };
 
 static const char * const ingenic_ost_clk_parents[] = { "ext" };