]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
clk: sp7021: convert from round_rate() to determine_rate()
authorBrian Masney <bmasney@redhat.com>
Mon, 11 Aug 2025 15:19:32 +0000 (11:19 -0400)
committerBrian Masney <bmasney@redhat.com>
Mon, 8 Sep 2025 13:41:30 +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/clk-sp7021.c

index 95d66191df4bdb3609128ea097be896ef3a1038a..445e3da50e29f931b73f05fe956d9d38affe0ca7 100644 (file)
@@ -412,25 +412,27 @@ static long sp_pll_calc_div(struct sp_pll *clk, unsigned long rate)
        return fbdiv;
 }
 
-static long sp_pll_round_rate(struct clk_hw *hw, unsigned long rate,
-                             unsigned long *prate)
+static int sp_pll_determine_rate(struct clk_hw *hw,
+                                struct clk_rate_request *req)
 {
        struct sp_pll *clk = to_sp_pll(hw);
        long ret;
 
-       if (rate == *prate) {
-               ret = *prate; /* bypass */
+       if (req->rate == req->best_parent_rate) {
+               ret = req->best_parent_rate; /* bypass */
        } else if (clk->div_width == DIV_A) {
-               ret = plla_round_rate(clk, rate);
+               ret = plla_round_rate(clk, req->rate);
        } else if (clk->div_width == DIV_TV) {
-               ret = plltv_div(clk, rate);
+               ret = plltv_div(clk, req->rate);
                if (ret < 0)
-                       ret = *prate;
+                       ret = req->best_parent_rate;
        } else {
-               ret = sp_pll_calc_div(clk, rate) * clk->brate;
+               ret = sp_pll_calc_div(clk, req->rate) * clk->brate;
        }
 
-       return ret;
+       req->rate = ret;
+
+       return 0;
 }
 
 static unsigned long sp_pll_recalc_rate(struct clk_hw *hw,
@@ -535,7 +537,7 @@ static const struct clk_ops sp_pll_ops = {
        .enable = sp_pll_enable,
        .disable = sp_pll_disable,
        .is_enabled = sp_pll_is_enabled,
-       .round_rate = sp_pll_round_rate,
+       .determine_rate = sp_pll_determine_rate,
        .recalc_rate = sp_pll_recalc_rate,
        .set_rate = sp_pll_set_rate
 };