Skip to content

Commit d93faac

Browse files
masneybclaudiubeznea
authored andcommitted
clk: microchip: core: remove duplicate determine_rate on pic32_sclk_ops
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: e9f039c ("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>
1 parent 8f0b4cc commit d93faac

1 file changed

Lines changed: 0 additions & 10 deletions

File tree

drivers/clk/microchip/clk-core.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -780,15 +780,6 @@ static unsigned long sclk_get_rate(struct clk_hw *hw, unsigned long parent_rate)
780780
return parent_rate / div;
781781
}
782782

783-
static int sclk_determine_rate(struct clk_hw *hw,
784-
struct clk_rate_request *req)
785-
{
786-
req->rate = calc_best_divided_rate(req->rate, req->best_parent_rate,
787-
SLEW_SYSDIV, 1);
788-
789-
return 0;
790-
}
791-
792783
static int sclk_set_rate(struct clk_hw *hw,
793784
unsigned long rate, unsigned long parent_rate)
794785
{
@@ -912,7 +903,6 @@ static int sclk_init(struct clk_hw *hw)
912903
const struct clk_ops pic32_sclk_ops = {
913904
.get_parent = sclk_get_parent,
914905
.set_parent = sclk_set_parent,
915-
.determine_rate = sclk_determine_rate,
916906
.set_rate = sclk_set_rate,
917907
.recalc_rate = sclk_get_rate,
918908
.init = sclk_init,

0 commit comments

Comments
 (0)