ARM: OMAP2+: clock: convert from round_rate() to determine_rate()

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.

The change to virt_prcm_set_ops had to be made manually.

Signed-off-by: Brian Masney <bmasney@redhat.com>
Link: https://lore.kernel.org/r/20250710-arm32-clk-round-rate-v1-2-a9146b77aca9@redhat.com
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

diff --git a/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c b/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
index 011076a5952f0bfb24eadd13b8991b41b8115bae..96c5cdc718c8b9449a4372e1bb83582eaa91440e 100644 (file)
--- a/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
+++ b/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
@@ -70,8 +70,8 @@ static unsigned long omap2_table_mpu_recalc(struct clk_hw *clk,
  * Some might argue L3-DDR, others ARM, others IVA. This code is simple and
  * just uses the ARM rates.
  */
-static long omap2_round_to_table_rate(struct clk_hw *hw, unsigned long rate,
-                              unsigned long *parent_rate)
+static int omap2_determine_rate_to_table(struct clk_hw *hw,
+                                        struct clk_rate_request *req)
 {
        const struct prcm_config *ptr;
        long highest_rate;
@@ -87,10 +87,12 @@ static long omap2_round_to_table_rate(struct clk_hw *hw, unsigned long rate,
                highest_rate = ptr->mpu_speed;
 
                /* Can check only after xtal frequency check */
-               if (ptr->mpu_speed <= rate)
+               if (ptr->mpu_speed <= req->rate)
                        break;
        }
-       return highest_rate;
+       req->rate = highest_rate;
+
+       return 0;
 }
 
 /* Sets basic clocks based on the specified rate */
@@ -215,7 +217,7 @@ static void omap2xxx_clkt_vps_late_init(void)
 static const struct clk_ops virt_prcm_set_ops = {
        .recalc_rate    = &omap2_table_mpu_recalc,
        .set_rate       = &omap2_select_table_rate,
-       .round_rate     = &omap2_round_to_table_rate,
+       .determine_rate = &omap2_determine_rate_to_table,
 };
 
 /**