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

clk/efm32gg: fix dt init prototype

Since commit 54196ccbe0ba (of: consolidate linker section OF match table
declarations) which went into 3.16-rc1 the following compiler warning is
generated:

In file included from drivers/clk/clk-efm32gg.c:12:0: include/linux/of.h:772:20:
warning: comparison of distinct pointer types lacks a cast [enabled by default]
.data = (fn == (fn_type)NULL) ? fn : fn }
^
include/linux/of.h:785:3: note: in expansion of macro '_OF_DECLARE'
_OF_DECLARE(table, name, compat, fn, of_init_fn_1)
^
include/linux/clk-provider.h:545:42: note: in expansion of macro 'OF_DECLARE_1'
#define CLK_OF_DECLARE(name, compat, fn) OF_DECLARE_1(clk, name, compat, fn)
^
drivers/clk/clk-efm32gg.c:81:1: note: in expansion of macro 'CLK_OF_DECLARE'
CLK_OF_DECLARE(efm32ggcmu, "efm32gg,cmu", efm32gg_cmu_init);
^

Fix it by making efm32gg_cmu_init return void.

Cc: Rob Herring <robh@kernel.org>
Reported-by: Bryan Hundven <bryanhundven@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Mike Turquette <mturquette@linaro.org>

authored by

Uwe Kleine-König and committed by
Mike Turquette
8ce8ebeb 067bb174

+3 -3
+3 -3
drivers/clk/clk-efm32gg.c
··· 22 22 .clk_num = ARRAY_SIZE(clk), 23 23 }; 24 24 25 - static int __init efm32gg_cmu_init(struct device_node *np) 25 + static void __init efm32gg_cmu_init(struct device_node *np) 26 26 { 27 27 int i; 28 28 void __iomem *base; ··· 33 33 base = of_iomap(np, 0); 34 34 if (!base) { 35 35 pr_warn("Failed to map address range for efm32gg,cmu node\n"); 36 - return -EADDRNOTAVAIL; 36 + return; 37 37 } 38 38 39 39 clk[clk_HFXO] = clk_register_fixed_rate(NULL, "HFXO", NULL, ··· 76 76 clk[clk_HFPERCLKDAC0] = clk_register_gate(NULL, "HFPERCLK.DAC0", 77 77 "HFXO", 0, base + CMU_HFPERCLKEN0, 17, 0, NULL); 78 78 79 - return of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data); 79 + of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data); 80 80 } 81 81 CLK_OF_DECLARE(efm32ggcmu, "efm32gg,cmu", efm32gg_cmu_init);