]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
rtc: rv3032: convert from round_rate() to determine_rate()
authorBrian Masney <bmasney@redhat.com>
Thu, 10 Jul 2025 15:20:35 +0000 (11:20 -0400)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Sun, 3 Aug 2025 00:57:06 +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-15-33140bb2278e@redhat.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-rv3032.c

index 2c6a8918acba50e57ed923db0834c7c4620ef2cd..b8376bd1d905be63afbcbc688825c0caff74a3b5 100644 (file)
@@ -646,19 +646,24 @@ static unsigned long rv3032_clkout_recalc_rate(struct clk_hw *hw,
        return clkout_xtal_rates[FIELD_GET(RV3032_CLKOUT2_FD_MSK, clkout)];
 }
 
-static long rv3032_clkout_round_rate(struct clk_hw *hw, unsigned long rate,
-                                    unsigned long *prate)
+static int rv3032_clkout_determine_rate(struct clk_hw *hw,
+                                       struct clk_rate_request *req)
 {
        int i, hfd;
 
-       if (rate < RV3032_HFD_STEP)
+       if (req->rate < RV3032_HFD_STEP)
                for (i = 0; i < ARRAY_SIZE(clkout_xtal_rates); i++)
-                       if (clkout_xtal_rates[i] <= rate)
-                               return clkout_xtal_rates[i];
+                       if (clkout_xtal_rates[i] <= req->rate) {
+                               req->rate = clkout_xtal_rates[i];
 
-       hfd = DIV_ROUND_CLOSEST(rate, RV3032_HFD_STEP);
+                               return 0;
+                       }
+
+       hfd = DIV_ROUND_CLOSEST(req->rate, RV3032_HFD_STEP);
 
-       return RV3032_HFD_STEP * clamp(hfd, 0, 8192);
+       req->rate = RV3032_HFD_STEP * clamp(hfd, 0, 8192);
+
+       return 0;
 }
 
 static int rv3032_clkout_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -738,7 +743,7 @@ static const struct clk_ops rv3032_clkout_ops = {
        .unprepare = rv3032_clkout_unprepare,
        .is_prepared = rv3032_clkout_is_prepared,
        .recalc_rate = rv3032_clkout_recalc_rate,
-       .round_rate = rv3032_clkout_round_rate,
+       .determine_rate = rv3032_clkout_determine_rate,
        .set_rate = rv3032_clkout_set_rate,
 };