Skip to content

Commit 3ff3360

Browse files
committed
clk: actions: owl-divider: convert from divider_round_rate() to divider_determine_rate()
The divider_round_rate() function is now deprecated, so let's migrate to divider_determine_rate() instead so that this deprecated API can be removed. Additionally, owl_divider_helper_round_rate() is no longer used, so let's drop that from the header file as well. Note that when the main function itself was migrated to use determine_rate, this was mistakenly converted to: req->rate = divider_round_rate(...) This is invalid in the case when an error occurs since it can set the rate to a negative value. Fixes: 1b04e12 ("clk: actions: owl-divider: convert from round_rate() to determine_rate()") Acked-by: Manivannan Sadhasivam <mani@kernel.org> Signed-off-by: Brian Masney <bmasney@redhat.com>
1 parent d0b7c5b commit 3ff3360

2 files changed

Lines changed: 2 additions & 20 deletions

File tree

drivers/clk/actions/owl-divider.c

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,13 @@
1313

1414
#include "owl-divider.h"
1515

16-
long owl_divider_helper_round_rate(struct owl_clk_common *common,
17-
const struct owl_divider_hw *div_hw,
18-
unsigned long rate,
19-
unsigned long *parent_rate)
20-
{
21-
return divider_round_rate(&common->hw, rate, parent_rate,
22-
div_hw->table, div_hw->width,
23-
div_hw->div_flags);
24-
}
25-
2616
static int owl_divider_determine_rate(struct clk_hw *hw,
2717
struct clk_rate_request *req)
2818
{
2919
struct owl_divider *div = hw_to_owl_divider(hw);
3020

31-
req->rate = owl_divider_helper_round_rate(&div->common, &div->div_hw,
32-
req->rate,
33-
&req->best_parent_rate);
34-
35-
return 0;
21+
return divider_determine_rate(hw, req, div->div_hw.table,
22+
div->div_hw.width, div->div_hw.div_flags);
3623
}
3724

3825
unsigned long owl_divider_helper_recalc_rate(struct owl_clk_common *common,

drivers/clk/actions/owl-divider.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@ static inline struct owl_divider *hw_to_owl_divider(struct clk_hw *hw)
5656
return container_of(common, struct owl_divider, common);
5757
}
5858

59-
long owl_divider_helper_round_rate(struct owl_clk_common *common,
60-
const struct owl_divider_hw *div_hw,
61-
unsigned long rate,
62-
unsigned long *parent_rate);
63-
6459
unsigned long owl_divider_helper_recalc_rate(struct owl_clk_common *common,
6560
const struct owl_divider_hw *div_hw,
6661
unsigned long parent_rate);

0 commit comments

Comments
 (0)