]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
clk: microchip: core: remove duplicate determine_rate on pic32_sclk_ops
authorBrian Masney <bmasney@redhat.com>
Fri, 5 Dec 2025 19:46:27 +0000 (14:46 -0500)
committerClaudiu Beznea <claudiu.beznea@tuxon.dev>
Sat, 10 Jan 2026 14:50:02 +0000 (16:50 +0200)
pic32_sclk_ops previously had a sclk_round_rate() member, and this was
recently converted over to sclk_determine_rate() with the help of a
Coccinelle semantic patch. pic32_sclk_ops now has two conflicting
determine_rate ops members.

Prior to the conversion, pic32_sclk_ops already had a determine_rate
member that points to __clk_mux_determine_rate(). When both the
round_rate() and determine_rate() ops are defined, the clk core only
uses the determine_rate() op. Let's go ahead and drop the recently
converted sclk_determine_rate() to match the previous functionality
prior to the conversion.

Fixes: e9f039c08cdc ("clk: microchip: core: convert from round_rate() to determine_rate()")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202511222115.uvHrP95A-lkp@intel.com/
Signed-off-by: Brian Masney <bmasney@redhat.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>
Link: https://lore.kernel.org/r/20251205-clk-microchip-fixes-v3-1-a02190705e47@redhat.com
Signed-off-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>
drivers/clk/microchip/clk-core.c

index b34348d491f3e1b576b2b9a8a66bfddd8c2296ea..a0163441dfe5c1dfc27dae48e64cf3cb3d6b764f 100644 (file)
@@ -780,15 +780,6 @@ static unsigned long sclk_get_rate(struct clk_hw *hw, unsigned long parent_rate)
        return parent_rate / div;
 }
 
-static int sclk_determine_rate(struct clk_hw *hw,
-                              struct clk_rate_request *req)
-{
-       req->rate = calc_best_divided_rate(req->rate, req->best_parent_rate,
-                                          SLEW_SYSDIV, 1);
-
-       return 0;
-}
-
 static int sclk_set_rate(struct clk_hw *hw,
                         unsigned long rate, unsigned long parent_rate)
 {
@@ -912,7 +903,6 @@ static int sclk_init(struct clk_hw *hw)
 const struct clk_ops pic32_sclk_ops = {
        .get_parent     = sclk_get_parent,
        .set_parent     = sclk_set_parent,
-       .determine_rate = sclk_determine_rate,
        .set_rate       = sclk_set_rate,
        .recalc_rate    = sclk_get_rate,
        .init           = sclk_init,