]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
rtc: m41t80: convert from round_rate() to determine_rate()
authorBrian Masney <bmasney@redhat.com>
Thu, 10 Jul 2025 15:20:29 +0000 (11:20 -0400)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Sun, 3 Aug 2025 00:57:05 +0000 (02:57 +0200)
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>
Link: https://lore.kernel.org/r/20250710-rtc-clk-round-rate-v1-9-33140bb2278e@redhat.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-m41t80.c

index 869358e9305b98488b5af556fb56739e0e3e22ca..740cab013f5907dd2f98c77164094986a732d5b1 100644 (file)
@@ -484,16 +484,17 @@ static unsigned long m41t80_sqw_recalc_rate(struct clk_hw *hw,
        return sqw_to_m41t80_data(hw)->freq;
 }
 
-static long m41t80_sqw_round_rate(struct clk_hw *hw, unsigned long rate,
-                                 unsigned long *prate)
+static int m41t80_sqw_determine_rate(struct clk_hw *hw,
+                                    struct clk_rate_request *req)
 {
-       if (rate >= M41T80_SQW_MAX_FREQ)
-               return M41T80_SQW_MAX_FREQ;
-       if (rate >= M41T80_SQW_MAX_FREQ / 4)
-               return M41T80_SQW_MAX_FREQ / 4;
-       if (!rate)
-               return 0;
-       return 1 << ilog2(rate);
+       if (req->rate >= M41T80_SQW_MAX_FREQ)
+               req->rate = M41T80_SQW_MAX_FREQ;
+       else if (req->rate >= M41T80_SQW_MAX_FREQ / 4)
+               req->rate = M41T80_SQW_MAX_FREQ / 4;
+       else if (req->rate)
+               req->rate = 1 << ilog2(req->rate);
+
+       return 0;
 }
 
 static int m41t80_sqw_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -564,7 +565,7 @@ static const struct clk_ops m41t80_sqw_ops = {
        .unprepare = m41t80_sqw_unprepare,
        .is_prepared = m41t80_sqw_is_prepared,
        .recalc_rate = m41t80_sqw_recalc_rate,
-       .round_rate = m41t80_sqw_round_rate,
+       .determine_rate = m41t80_sqw_determine_rate,
        .set_rate = m41t80_sqw_set_rate,
 };