Skip to content

Commit 6587c9d

Browse files
committed
clk: stm32: stm32-core: 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: cd1cb38 ("clk: stm32: stm32-core: convert from round_rate() to determine_rate()") Signed-off-by: Brian Masney <bmasney@redhat.com>
1 parent f78fb94 commit 6587c9d

1 file changed

Lines changed: 7 additions & 15 deletions

File tree

drivers/clk/stm32/clk-stm32-core.c

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -369,13 +369,10 @@ static int clk_stm32_divider_determine_rate(struct clk_hw *hw,
369369
val = readl(div->base + divider->offset) >> divider->shift;
370370
val &= clk_div_mask(divider->width);
371371

372-
req->rate = divider_ro_round_rate(hw, req->rate,
373-
&req->best_parent_rate,
374-
divider->table,
375-
divider->width,
376-
divider->flags, val);
377-
378-
return 0;
372+
return divider_ro_determine_rate(hw, req,
373+
divider->table,
374+
divider->width,
375+
divider->flags, val);
379376
}
380377

381378
req->rate = divider_round_rate_parent(hw, clk_hw_get_parent(hw),
@@ -455,14 +452,9 @@ static int clk_stm32_composite_determine_rate(struct clk_hw *hw,
455452
val = readl(composite->base + divider->offset) >> divider->shift;
456453
val &= clk_div_mask(divider->width);
457454

458-
rate = divider_ro_round_rate(hw, req->rate, &req->best_parent_rate,
459-
divider->table, divider->width, divider->flags,
460-
val);
461-
if (rate < 0)
462-
return rate;
463-
464-
req->rate = rate;
465-
return 0;
455+
return divider_ro_determine_rate(hw, req, divider->table,
456+
divider->width, divider->flags,
457+
val);
466458
}
467459

468460
rate = divider_round_rate_parent(hw, clk_hw_get_parent(hw),

0 commit comments

Comments
 (0)