Commit cd1cb388 authored by Brian Masney's avatar Brian Masney
Browse files

clk: stm32: stm32-core: convert from round_rate() to determine_rate() 



The round_rate() clk ops is deprecated, so migrate this driver from
round_rate() to determine_rate() using the Coccinelle semantic patch
on the cover letter of this series.

Reviewed-by: default avatarGabriel Fernandez <gabriel.fernandez@foss.st.com>
Signed-off-by: default avatarBrian Masney <bmasney@redhat.com>
parent 028b0eb1

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

+18 −10
Original line number Diff line number Diff line
@@ -351,14 +351,14 @@ static int clk_stm32_divider_set_rate(struct clk_hw *hw, unsigned long rate, 
	return ret;

}



static long clk_stm32_divider_round_rate(struct clk_hw *hw, unsigned long rate,

					 unsigned long *prate)

static int clk_stm32_divider_determine_rate(struct clk_hw *hw,

					    struct clk_rate_request *req)

{

	struct clk_stm32_div *div = to_clk_stm32_divider(hw);

	const struct stm32_div_cfg *divider;



	if (div->div_id == NO_STM32_DIV)

		return rate;

		return 0;



	divider = &div->clock_data->dividers[div->div_id];
@@ -369,14 +369,22 @@ static long clk_stm32_divider_round_rate(struct clk_hw *hw, unsigned long rate, 
		val =  readl(div->base + divider->offset) >> divider->shift;

		val &= clk_div_mask(divider->width);



		return divider_ro_round_rate(hw, rate, prate, divider->table,

				divider->width, divider->flags,

				val);

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

						  &req->best_parent_rate,

						  divider->table,

						  divider->width,

						  divider->flags, val);



		return 0;

	}



	return divider_round_rate_parent(hw, clk_hw_get_parent(hw),

					 rate, prate, divider->table,

	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;

}



static unsigned long clk_stm32_divider_recalc_rate(struct clk_hw *hw,
@@ -392,7 +400,7 @@ static unsigned long clk_stm32_divider_recalc_rate(struct clk_hw *hw, 


const struct clk_ops clk_stm32_divider_ops = {

	.recalc_rate	= clk_stm32_divider_recalc_rate,

	.round_rate	= clk_stm32_divider_round_rate,

	.determine_rate = clk_stm32_divider_determine_rate,

	.set_rate	= clk_stm32_divider_set_rate,

};