mirror of
https://github.com/torvalds/linux.git
synced 2026-05-12 16:18:45 +02:00
clk: stm32: stm32-core: convert from divider_round_rate_parent() to divider_determine_rate()
The divider_round_rate_parent() 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: cd1cb38836 ("clk: stm32: stm32-core: convert from round_rate() to determine_rate()")
Signed-off-by: Brian Masney <bmasney@redhat.com>
This commit is contained in:
parent
6587c9dacc
commit
2532795a6d
|
|
@ -375,13 +375,8 @@ static int clk_stm32_divider_determine_rate(struct clk_hw *hw,
|
|||
divider->flags, val);
|
||||
}
|
||||
|
||||
req->rate = divider_round_rate_parent(hw, clk_hw_get_parent(hw),
|
||||
req->rate,
|
||||
&req->best_parent_rate,
|
||||
divider->table,
|
||||
divider->width, divider->flags);
|
||||
|
||||
return 0;
|
||||
return divider_determine_rate(hw, req, divider->table, divider->width,
|
||||
divider->flags);
|
||||
}
|
||||
|
||||
static unsigned long clk_stm32_divider_recalc_rate(struct clk_hw *hw,
|
||||
|
|
@ -438,7 +433,6 @@ static int clk_stm32_composite_determine_rate(struct clk_hw *hw,
|
|||
{
|
||||
struct clk_stm32_composite *composite = to_clk_stm32_composite(hw);
|
||||
const struct stm32_div_cfg *divider;
|
||||
long rate;
|
||||
|
||||
if (composite->div_id == NO_STM32_DIV)
|
||||
return 0;
|
||||
|
|
@ -457,14 +451,8 @@ static int clk_stm32_composite_determine_rate(struct clk_hw *hw,
|
|||
val);
|
||||
}
|
||||
|
||||
rate = divider_round_rate_parent(hw, clk_hw_get_parent(hw),
|
||||
req->rate, &req->best_parent_rate,
|
||||
divider->table, divider->width, divider->flags);
|
||||
if (rate < 0)
|
||||
return rate;
|
||||
|
||||
req->rate = rate;
|
||||
return 0;
|
||||
return divider_determine_rate(hw, req, divider->table, divider->width,
|
||||
divider->flags);
|
||||
}
|
||||
|
||||
static u8 clk_stm32_composite_get_parent(struct clk_hw *hw)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user