Commit 6587c9da authored by Brian Masney's avatar Brian Masney
Browse files

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: cd1cb388 ("clk: stm32: stm32-core: convert from round_rate() to determine_rate()")
Signed-off-by: default avatarBrian Masney <bmasney@redhat.com>
parent f78fb942

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

+7 −15
Original line number Diff line number Diff line
@@ -369,13 +369,10 @@ static int clk_stm32_divider_determine_rate(struct clk_hw *hw, 
		val =  readl(div->base + divider->offset) >> divider->shift;

		val &= clk_div_mask(divider->width);



		req->rate = divider_ro_round_rate(hw, req->rate,

						  &req->best_parent_rate,

		return divider_ro_determine_rate(hw, req,

						 divider->table,

						 divider->width,

						 divider->flags, val);



		return 0;

	}



	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, 
		val =  readl(composite->base + divider->offset) >> divider->shift;

		val &= clk_div_mask(divider->width);



		rate = divider_ro_round_rate(hw, req->rate, &req->best_parent_rate,

					     divider->table, divider->width, divider->flags,

		return divider_ro_determine_rate(hw, req, divider->table,

						 divider->width, divider->flags,

						 val);

		if (rate < 0)

			return rate;



		req->rate = rate;

		return 0;

	}



	rate = divider_round_rate_parent(hw, clk_hw_get_parent(hw),