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

clk: divider: remove round_rate() in favor of determine_rate() 



This driver implements both the determine_rate() and round_rate() clk
ops, and the round_rate() clk ops is deprecated. When both are defined,
clk_core_determine_round_nolock() from the clk core will only use the
determine_rate() clk ops. Also all clk drivers that directly calls
divider's round_rate() have been migrated over to determine_rate(). So
let's remove the round_rate() clk ops.

Reviewed-by: default avatarAlexander Sverdlin <alexander.sverdlin@gmail.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarBrian Masney <bmasney@redhat.com>
parent e7666eae

drivers/clk/clk-divider.c

+0 −23
Original line number Diff line number Diff line
@@ -431,27 +431,6 @@ long divider_ro_round_rate_parent(struct clk_hw *hw, struct clk_hw *parent, 
}

EXPORT_SYMBOL_GPL(divider_ro_round_rate_parent);



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

				unsigned long *prate)

{

	struct clk_divider *divider = to_clk_divider(hw);



	/* if read only, just return current value */

	if (divider->flags & CLK_DIVIDER_READ_ONLY) {

		u32 val;



		val = clk_div_readl(divider) >> divider->shift;

		val &= clk_div_mask(divider->width);



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

					     divider->width, divider->flags,

					     val);

	}



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

				  divider->width, divider->flags);

}



static int clk_divider_determine_rate(struct clk_hw *hw,

				      struct clk_rate_request *req)

{
@@ -527,7 +506,6 @@ static int clk_divider_set_rate(struct clk_hw *hw, unsigned long rate, 


const struct clk_ops clk_divider_ops = {

	.recalc_rate = clk_divider_recalc_rate,

	.round_rate = clk_divider_round_rate,

	.determine_rate = clk_divider_determine_rate,

	.set_rate = clk_divider_set_rate,

};
@@ -535,7 +513,6 @@ EXPORT_SYMBOL_GPL(clk_divider_ops); 


const struct clk_ops clk_divider_ro_ops = {

	.recalc_rate = clk_divider_recalc_rate,

	.round_rate = clk_divider_round_rate,

	.determine_rate = clk_divider_determine_rate,

};

EXPORT_SYMBOL_GPL(clk_divider_ro_ops);