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

Signed-off-by: Brian Masney <bmasney@redhat.com>
drivers/clk/at91/clk-plldiv.c

index ba3a1839a96dc229ef27293a38bd26704d064d7f..3ac09fecc54eaed1a9b3fb51df5debfc25d0053b 100644 (file)
@@ -33,21 +33,33 @@ static unsigned long clk_plldiv_recalc_rate(struct clk_hw *hw,
        return parent_rate;
 }
 
-static long clk_plldiv_round_rate(struct clk_hw *hw, unsigned long rate,
-                                       unsigned long *parent_rate)
+static int clk_plldiv_determine_rate(struct clk_hw *hw,
+                                    struct clk_rate_request *req)
 {
        unsigned long div;
 
-       if (rate > *parent_rate)
-               return *parent_rate;
-       div = *parent_rate / 2;
-       if (rate < div)
-               return div;
+       if (req->rate > req->best_parent_rate) {
+               req->rate = req->best_parent_rate;
 
-       if (rate - div < *parent_rate - rate)
-               return div;
+               return 0;
+       }
+
+       div = req->best_parent_rate / 2;
+       if (req->rate < div) {
+               req->rate = div;
+
+               return 0;
+       }
+
+       if (req->rate - div < req->best_parent_rate - req->rate) {
+               req->rate = div;
 
-       return *parent_rate;
+               return 0;
+       }
+
+       req->rate = req->best_parent_rate;
+
+       return 0;
 }
 
 static int clk_plldiv_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -66,7 +78,7 @@ static int clk_plldiv_set_rate(struct clk_hw *hw, unsigned long rate,
 
 static const struct clk_ops plldiv_ops = {
        .recalc_rate = clk_plldiv_recalc_rate,
-       .round_rate = clk_plldiv_round_rate,
+       .determine_rate = clk_plldiv_determine_rate,
        .set_rate = clk_plldiv_set_rate,
 };