]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
clk: apple-nco: convert from round_rate() to determine_rate()
authorBrian Masney <bmasney@redhat.com>
Mon, 11 Aug 2025 15:19:07 +0000 (11:19 -0400)
committerBrian Masney <bmasney@redhat.com>
Mon, 8 Sep 2025 13:41:29 +0000 (09:41 -0400)
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.

Reviewed-by: Janne Grunau <j@jannau.net>
Signed-off-by: Brian Masney <bmasney@redhat.com>
drivers/clk/clk-apple-nco.c

index 457a48d4894128fff24d50eb7c9a3cbd7d35f245..d3ced4a0f029ec0440ff42d49d31e314fdf86846 100644 (file)
@@ -212,13 +212,15 @@ static unsigned long applnco_recalc_rate(struct clk_hw *hw,
                        ((u64) div) * incbase + inc1);
 }
 
-static long applnco_round_rate(struct clk_hw *hw, unsigned long rate,
-                               unsigned long *parent_rate)
+static int applnco_determine_rate(struct clk_hw *hw,
+                                 struct clk_rate_request *req)
 {
-       unsigned long lo = *parent_rate / (COARSE_DIV_OFFSET + LFSR_TBLSIZE) + 1;
-       unsigned long hi = *parent_rate / COARSE_DIV_OFFSET;
+       unsigned long lo = req->best_parent_rate / (COARSE_DIV_OFFSET + LFSR_TBLSIZE) + 1;
+       unsigned long hi = req->best_parent_rate / COARSE_DIV_OFFSET;
 
-       return clamp(rate, lo, hi);
+       req->rate = clamp(req->rate, lo, hi);
+
+       return 0;
 }
 
 static int applnco_enable(struct clk_hw *hw)
@@ -246,7 +248,7 @@ static void applnco_disable(struct clk_hw *hw)
 static const struct clk_ops applnco_ops = {
        .set_rate = applnco_set_rate,
        .recalc_rate = applnco_recalc_rate,
-       .round_rate = applnco_round_rate,
+       .determine_rate = applnco_determine_rate,
        .enable = applnco_enable,
        .disable = applnco_disable,
        .is_enabled = applnco_is_enabled,