Skip to content

Commit fc5d7e7

Browse files
committed
clk: milbeaut: convert from divider_ro_round_rate() to divider_ro_determine_rate()
The divider_ro_round_rate() function is now deprecated, so let's migrate to divider_ro_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: fe67c68 ("clk: milbeaut: convert from divider_round_rate() to divider_determine_rate()") Signed-off-by: Brian Masney <bmasney@redhat.com>
1 parent 11d3c67 commit fc5d7e7

1 file changed

Lines changed: 3 additions & 7 deletions

File tree

drivers/clk/clk-milbeaut.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -398,13 +398,9 @@ static int m10v_clk_divider_determine_rate(struct clk_hw *hw,
398398
val = readl(divider->reg) >> divider->shift;
399399
val &= clk_div_mask(divider->width);
400400

401-
req->rate = divider_ro_round_rate(hw, req->rate,
402-
&req->best_parent_rate,
403-
divider->table,
404-
divider->width,
405-
divider->flags, val);
406-
407-
return 0;
401+
return divider_ro_determine_rate(hw, req, divider->table,
402+
divider->width, divider->flags,
403+
val);
408404
}
409405

410406
req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,

0 commit comments

Comments
 (0)