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

index cea05fca0bccddc6384c462cf1ebdc59b377a24d..cd4b1db902e9f68781787236bec56c2cae8436ab 100644 (file)
@@ -367,16 +367,21 @@ static unsigned long nct3018y_clkout_recalc_rate(struct clk_hw *hw,
        return clkout_rates[flags];
 }
 
-static long nct3018y_clkout_round_rate(struct clk_hw *hw, unsigned long rate,
-                                      unsigned long *prate)
+static int nct3018y_clkout_determine_rate(struct clk_hw *hw,
+                                         struct clk_rate_request *req)
 {
        int i;
 
        for (i = 0; i < ARRAY_SIZE(clkout_rates); i++)
-               if (clkout_rates[i] <= rate)
-                       return clkout_rates[i];
+               if (clkout_rates[i] <= req->rate) {
+                       req->rate = clkout_rates[i];
 
-       return clkout_rates[0];
+                       return 0;
+               }
+
+       req->rate = clkout_rates[0];
+
+       return 0;
 }
 
 static int nct3018y_clkout_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -446,7 +451,7 @@ static const struct clk_ops nct3018y_clkout_ops = {
        .unprepare = nct3018y_clkout_unprepare,
        .is_prepared = nct3018y_clkout_is_prepared,
        .recalc_rate = nct3018y_clkout_recalc_rate,
-       .round_rate = nct3018y_clkout_round_rate,
+       .determine_rate = nct3018y_clkout_determine_rate,
        .set_rate = nct3018y_clkout_set_rate,
 };