diff options
author | Rob Herring <robh@kernel.org> | 2014-05-12 12:19:39 -0400 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2014-05-20 15:25:21 -0400 |
commit | 25585daaa03c790ec86e397e2fc188f56d4deaa9 (patch) | |
tree | 7c7b3d41be238dd041ff1115b69122c692434965 /arch/arm/mach-imx | |
parent | 9dd3107576c4bbd40e1c2c8b24d560abf9a7b991 (diff) |
ARM: imx: fix function type for CLK_OF_DECLARE
Adding function type checking to CLK_OF_DECLARE found a type mismatch with
mx35_clocks_init_dt. The function should return void.
Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Shawn Guo <shawn.guo@freescale.com>
Cc: Sascha Hauer <kernel@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r-- | arch/arm/mach-imx/clk-imx35.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/clk-imx35.c b/arch/arm/mach-imx/clk-imx35.c index a4d5e425cd82..71c86a2f856d 100644 --- a/arch/arm/mach-imx/clk-imx35.c +++ b/arch/arm/mach-imx/clk-imx35.c | |||
@@ -289,14 +289,12 @@ int __init mx35_clocks_init(void) | |||
289 | return 0; | 289 | return 0; |
290 | } | 290 | } |
291 | 291 | ||
292 | static int __init mx35_clocks_init_dt(struct device_node *ccm_node) | 292 | static void __init mx35_clocks_init_dt(struct device_node *ccm_node) |
293 | { | 293 | { |
294 | clk_data.clks = clk; | 294 | clk_data.clks = clk; |
295 | clk_data.clk_num = ARRAY_SIZE(clk); | 295 | clk_data.clk_num = ARRAY_SIZE(clk); |
296 | of_clk_add_provider(ccm_node, of_clk_src_onecell_get, &clk_data); | 296 | of_clk_add_provider(ccm_node, of_clk_src_onecell_get, &clk_data); |
297 | 297 | ||
298 | mx35_clocks_init(); | 298 | mx35_clocks_init(); |
299 | |||
300 | return 0; | ||
301 | } | 299 | } |
302 | CLK_OF_DECLARE(imx35, "fsl,imx35-ccm", mx35_clocks_init_dt); | 300 | CLK_OF_DECLARE(imx35, "fsl,imx35-ccm", mx35_clocks_init_dt); |