Skip to content

Commit 30a8078

Browse files
committed
clk: zynqmp: 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. 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: 0f9cf96 ("clk: zynqmp: divider: convert from round_rate() to determine_rate()") Signed-off-by: Brian Masney <bmasney@redhat.com>
1 parent bb1b0e6 commit 30a8078

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

drivers/clk/zynqmp/divider.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,9 @@ static int zynqmp_clk_divider_determine_rate(struct clk_hw *hw,
151151

152152
width = fls(divider->max_div);
153153

154-
req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
155-
NULL, width, divider->flags);
154+
ret = divider_determine_rate(hw, req, NULL, width, divider->flags);
155+
if (ret != 0)
156+
return ret;
156157

157158
if (divider->is_frac && (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) &&
158159
(req->rate % req->best_parent_rate))

0 commit comments

Comments
 (0)