clk: bcm: bcm2835: convert from round_rate() to determine_rate()
authorBrian Masney <bmasney@redhat.com>
Thu, 3 Jul 2025 23:22:25 +0000 (19:22 -0400)
committerStephen Boyd <sboyd@kernel.org>
Thu, 24 Jul 2025 21:32:14 +0000 (14:32 -0700)
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/20250703-clk-cocci-drop-round-rate-v1-1-3a8da898367e@redhat.com
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
drivers/clk/bcm/clk-bcm2835.c

index fb04734afc806286b6a68996f36bd8a49b542cc8..5e7788406de39c94884cbc3aa162c378443322c0 100644 (file)
@@ -570,18 +570,23 @@ static long bcm2835_pll_rate_from_divisors(unsigned long parent_rate,
        return rate >> A2W_PLL_FRAC_BITS;
 }
 
-static long bcm2835_pll_round_rate(struct clk_hw *hw, unsigned long rate,
-                                  unsigned long *parent_rate)
+static int bcm2835_pll_determine_rate(struct clk_hw *hw,
+                                     struct clk_rate_request *req)
 {
        struct bcm2835_pll *pll = container_of(hw, struct bcm2835_pll, hw);
        const struct bcm2835_pll_data *data = pll->data;
        u32 ndiv, fdiv;
 
-       rate = clamp(rate, data->min_rate, data->max_rate);
+       req->rate = clamp(req->rate, data->min_rate, data->max_rate);
 
-       bcm2835_pll_choose_ndiv_and_fdiv(rate, *parent_rate, &ndiv, &fdiv);
+       bcm2835_pll_choose_ndiv_and_fdiv(req->rate, req->best_parent_rate,
+                                        &ndiv, &fdiv);
 
-       return bcm2835_pll_rate_from_divisors(*parent_rate, ndiv, fdiv, 1);
+       req->rate = bcm2835_pll_rate_from_divisors(req->best_parent_rate,
+                                                  ndiv, fdiv,
+                                                  1);
+
+       return 0;
 }
 
 static unsigned long bcm2835_pll_get_rate(struct clk_hw *hw,
@@ -783,7 +788,7 @@ static const struct clk_ops bcm2835_pll_clk_ops = {
        .unprepare = bcm2835_pll_off,
        .recalc_rate = bcm2835_pll_get_rate,
        .set_rate = bcm2835_pll_set_rate,
-       .round_rate = bcm2835_pll_round_rate,
+       .determine_rate = bcm2835_pll_determine_rate,
        .debug_init = bcm2835_pll_debug_init,
 };