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

index b1dadc0a5e7556a8570286344818c2d1157bf9e8..07e2f3c5c4549e28726b2dccd5f465f56aa9e694 100644 (file)
@@ -128,19 +128,19 @@ static unsigned long jz4780_otg_phy_recalc_rate(struct clk_hw *hw,
        return parent_rate;
 }
 
-static long jz4780_otg_phy_round_rate(struct clk_hw *hw, unsigned long req_rate,
-                                     unsigned long *parent_rate)
+static int jz4780_otg_phy_determine_rate(struct clk_hw *hw,
+                                        struct clk_rate_request *req)
 {
-       if (req_rate < 15600000)
-               return 12000000;
-
-       if (req_rate < 21600000)
-               return 19200000;
+       if (req->rate < 15600000)
+               req->rate = 12000000;
+       else if (req->rate < 21600000)
+               req->rate = 19200000;
+       else if (req->rate < 36000000)
+               req->rate = 24000000;
+       else
+               req->rate = 48000000;
 
-       if (req_rate < 36000000)
-               return 24000000;
-
-       return 48000000;
+       return 0;
 }
 
 static int jz4780_otg_phy_set_rate(struct clk_hw *hw, unsigned long req_rate,
@@ -212,7 +212,7 @@ static int jz4780_otg_phy_is_enabled(struct clk_hw *hw)
 
 static const struct clk_ops jz4780_otg_phy_ops = {
        .recalc_rate = jz4780_otg_phy_recalc_rate,
-       .round_rate = jz4780_otg_phy_round_rate,
+       .determine_rate = jz4780_otg_phy_determine_rate,
        .set_rate = jz4780_otg_phy_set_rate,
 
        .enable         = jz4780_otg_phy_enable,