ARM: mach-imx: clk-imx51-imx53: Remove return value from mx53_clocks_init()
Subsystems (3)
Fabio Estevam
reviewerPATCH v2 1/1 ARM: mach-imx: clk-imx51-imx53: Remove return value from mx53_clocks_init()
From: Fabio Estevam <[email protected]>
Commit 915cc59130b (Merge remote-tracking branch 'imx-mxs/for-next') tried to fix a conflict, but missed to remove the return value from mx53_clocks_init(), which causes the following build warning:
arch/arm/mach-imx/clk-imx51-imx53.c:579:2: warning: 'return' with a value, in function returning void [enabled by default]
---
Changes since v1:
- Explain that the warning came from conflict resolution instead.
arch/arm/mach-imx/clk-imx51-imx53.c | 2 -- 1 file changed, 2 deletions(-)
arch/arm/mach-imx/clk-imx51-imx53.c +0 -2
@@ -575,7 +575,5 @@ static void __init mx53_clocks_init(struct device_node *np)WARN_ON (!base); irq =irq_of_parse_and_map (np,0 );mxc_timer_init (base, irq); - -return 0 ; }CLK_OF_DECLARE (imx53_ccm,"fsl,imx53-ccm" , mx53_clocks_init);
Signature · 1 line
1.8.1.2
PATCH v2 1/1 ARM: mach-imx: clk-imx51-imx53: Remove return value from mx53_clocks_init()
Quoted 21 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Commit
915cc59130b(Merge remote-tracking branch 'imx-mxs/for-next') tried to fix a conflict, but missed to remove the return value frommx53_clocks_init(), which causes the following build warning:
arch/arm/mach-imx/clk-imx51-imx53.c:579:2: warning: 'return' with a value, in function returning void [enabled by default]Signed-off-by Fabio Estevam <[email protected]>---
Changes since v1:
- Explain that the warning came from conflict resolution instead.arch/arm/mach-imx/clk-imx51-imx53.c | 2 -- 1 file changed, 2 deletions(-)arch/arm/mach-imx/clk-imx51-imx53.c +0
-0
arch/arm/mach-imx/clk-imx51-imx53.c static void __init mx53_clocks_init(struct device_node *np) · line 579
Quoted 7 lines
arch/arm/mach-imx/clk-imx51-imx53.c +0
-2@@ -575,7 +575,5 @@ static void __init mx53_clocks_init(struct device_node *np)WARN_ON (!base); irq =irq_of_parse_and_map (np,0 );mxc_timer_init (base, irq); - -return 0 ; }CLK_OF_DECLARE (imx53_ccm,"fsl,imx53-ccm" , mx53_clocks_init);
Thanks, I've fixed that up in yesterday's linux-next merge conflict resolution.
Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131015/b06a3307/attachment.sig>