There are no users of this anymore in the tree and the clk core implements something similar now, we can remove imx_register_uart_clocks(). Do so. Signed-off-by: André Draszik <andre.draszik@xxxxxxxxxx> --- drivers/clk/imx/clk.c | 72 --------------------------------------------------- drivers/clk/imx/clk.h | 7 ----- 2 files changed, 79 deletions(-) diff --git a/drivers/clk/imx/clk.c b/drivers/clk/imx/clk.c index df83bd939492..5f998e56a4ed 100644 --- a/drivers/clk/imx/clk.c +++ b/drivers/clk/imx/clk.c @@ -154,77 +154,5 @@ void imx_cscmr1_fixup(u32 *val) return; } -#ifndef MODULE - -static bool imx_keep_uart_clocks; -static int imx_enabled_uart_clocks; -static struct clk **imx_uart_clocks; - -static int __init imx_keep_uart_clocks_param(char *str) -{ - imx_keep_uart_clocks = 1; - - return 0; -} -__setup_param("earlycon", imx_keep_uart_earlycon, - imx_keep_uart_clocks_param, 0); -__setup_param("earlyprintk", imx_keep_uart_earlyprintk, - imx_keep_uart_clocks_param, 0); - -void imx_register_uart_clocks(void) -{ - unsigned int num __maybe_unused; - - imx_enabled_uart_clocks = 0; - -/* i.MX boards use device trees now. For build tests without CONFIG_OF, do nothing */ -#ifdef CONFIG_OF - if (imx_keep_uart_clocks) { - int i; - - num = of_clk_get_parent_count(of_stdout); - if (!num) - return; - - if (!of_stdout) - return; - - imx_uart_clocks = kcalloc(num, sizeof(struct clk *), GFP_KERNEL); - if (!imx_uart_clocks) - return; - - for (i = 0; i < num; i++) { - imx_uart_clocks[imx_enabled_uart_clocks] = of_clk_get(of_stdout, i); - - /* Stop if there are no more of_stdout references */ - if (IS_ERR(imx_uart_clocks[imx_enabled_uart_clocks])) - return; - - /* Only enable the clock if it's not NULL */ - if (imx_uart_clocks[imx_enabled_uart_clocks]) - clk_prepare_enable(imx_uart_clocks[imx_enabled_uart_clocks++]); - } - } -#endif -} - -static int __init imx_clk_disable_uart(void) -{ - if (imx_keep_uart_clocks && imx_enabled_uart_clocks) { - int i; - - for (i = 0; i < imx_enabled_uart_clocks; i++) { - clk_disable_unprepare(imx_uart_clocks[i]); - clk_put(imx_uart_clocks[i]); - } - } - - kfree(imx_uart_clocks); - - return 0; -} -late_initcall_sync(imx_clk_disable_uart); -#endif - MODULE_DESCRIPTION("Common clock support for NXP i.MX SoC family"); MODULE_LICENSE("GPL v2"); diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h index aa5202f284f3..314730f848f7 100644 --- a/drivers/clk/imx/clk.h +++ b/drivers/clk/imx/clk.h @@ -11,13 +11,6 @@ extern bool mcore_booted; void imx_check_clocks(struct clk *clks[], unsigned int count); void imx_check_clk_hws(struct clk_hw *clks[], unsigned int count); -#ifndef MODULE -void imx_register_uart_clocks(void); -#else -static inline void imx_register_uart_clocks(void) -{ -} -#endif void imx_mmdc_mask_handshake(void __iomem *ccm_base, unsigned int chn); void imx_unregister_hw_clocks(struct clk_hw *hws[], unsigned int count); -- 2.46.0.rc2.264.g509ed76dc8-goog