Skip to content

Commit 7468ac0

Browse files
committed
clk: bm1880: 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: cf1d95f ("clk: bm1880: convert from divider_round_rate() to divider_determine_rate()") Acked-by: Manivannan Sadhasivam <mani@kernel.org> Signed-off-by: Brian Masney <bmasney@redhat.com>
1 parent 3ff3360 commit 7468ac0

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

drivers/clk/clk-bm1880.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -621,12 +621,8 @@ static int bm1880_clk_div_determine_rate(struct clk_hw *hw,
621621
val = readl(reg_addr) >> div->shift;
622622
val &= clk_div_mask(div->width);
623623

624-
req->rate = divider_ro_round_rate(hw, req->rate,
625-
&req->best_parent_rate,
626-
div->table,
627-
div->width, div->flags, val);
628-
629-
return 0;
624+
return divider_ro_determine_rate(hw, req, div->table,
625+
div->width, div->flags, val);
630626
}
631627

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

0 commit comments

Comments
 (0)