summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorRob Herring2014-05-12 18:19:39 +0200
committerRob Herring2014-05-20 21:25:21 +0200
commit25585daaa03c790ec86e397e2fc188f56d4deaa9 (patch)
tree7c7b3d41be238dd041ff1115b69122c692434965 /arch/arm/mach-imx
parentof: align RESERVEDMEM_OF_DECLARE function callbacks to other callbacks (diff)
downloadkernel-qcow2-linux-25585daaa03c790ec86e397e2fc188f56d4deaa9.tar.gz
kernel-qcow2-linux-25585daaa03c790ec86e397e2fc188f56d4deaa9.tar.xz
kernel-qcow2-linux-25585daaa03c790ec86e397e2fc188f56d4deaa9.zip
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.c4
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)
return 0;
}
-static int __init mx35_clocks_init_dt(struct device_node *ccm_node)
+static void __init mx35_clocks_init_dt(struct device_node *ccm_node)
{
clk_data.clks = clk;
clk_data.clk_num = ARRAY_SIZE(clk);
of_clk_add_provider(ccm_node, of_clk_src_onecell_get, &clk_data);
mx35_clocks_init();
-
- return 0;
}
CLK_OF_DECLARE(imx35, "fsl,imx35-ccm", mx35_clocks_init_dt);