Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: ti: dpll: 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, so let's remove the round_rate() clk ops since
it's unused.

Tested-by: Anddreas Kemnade <andreas@kemnade.info> # OMAP3 GTA04, OMAP4 Panda
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Tested-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Brian Masney <bmasney@redhat.com>

-6
-6
drivers/clk/ti/dpll.c
··· 25 25 .enable = &omap3_noncore_dpll_enable, 26 26 .disable = &omap3_noncore_dpll_disable, 27 27 .recalc_rate = &omap4_dpll_regm4xen_recalc, 28 - .round_rate = &omap4_dpll_regm4xen_round_rate, 29 28 .set_rate = &omap3_noncore_dpll_set_rate, 30 29 .set_parent = &omap3_noncore_dpll_set_parent, 31 30 .set_rate_and_parent = &omap3_noncore_dpll_set_rate_and_parent, ··· 47 48 .enable = &omap3_noncore_dpll_enable, 48 49 .disable = &omap3_noncore_dpll_disable, 49 50 .recalc_rate = &omap3_dpll_recalc, 50 - .round_rate = &omap2_dpll_round_rate, 51 51 .set_rate = &omap3_noncore_dpll_set_rate, 52 52 .set_parent = &omap3_noncore_dpll_set_parent, 53 53 .set_rate_and_parent = &omap3_noncore_dpll_set_rate_and_parent, ··· 59 61 static const struct clk_ops dpll_no_gate_ck_ops = { 60 62 .recalc_rate = &omap3_dpll_recalc, 61 63 .get_parent = &omap2_init_dpll_parent, 62 - .round_rate = &omap2_dpll_round_rate, 63 64 .set_rate = &omap3_noncore_dpll_set_rate, 64 65 .set_parent = &omap3_noncore_dpll_set_parent, 65 66 .set_rate_and_parent = &omap3_noncore_dpll_set_rate_and_parent, ··· 100 103 .set_parent = &omap3_noncore_dpll_set_parent, 101 104 .set_rate_and_parent = &omap3_noncore_dpll_set_rate_and_parent, 102 105 .determine_rate = &omap3_noncore_dpll_determine_rate, 103 - .round_rate = &omap2_dpll_round_rate, 104 106 }; 105 107 106 108 static const struct clk_ops omap3_dpll5_ck_ops = { ··· 111 115 .set_parent = &omap3_noncore_dpll_set_parent, 112 116 .set_rate_and_parent = &omap3_noncore_dpll_set_rate_and_parent, 113 117 .determine_rate = &omap3_noncore_dpll_determine_rate, 114 - .round_rate = &omap2_dpll_round_rate, 115 118 }; 116 119 117 120 static const struct clk_ops omap3_dpll_per_ck_ops = { ··· 122 127 .set_parent = &omap3_noncore_dpll_set_parent, 123 128 .set_rate_and_parent = &omap3_dpll4_set_rate_and_parent, 124 129 .determine_rate = &omap3_noncore_dpll_determine_rate, 125 - .round_rate = &omap2_dpll_round_rate, 126 130 }; 127 131 #endif 128 132