| Message ID | 1381337700-22465-1-git-send-email-festevam@gmail.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Oct 09, 2013 at 01:55:00PM -0300, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@freescale.com> > > 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] > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > --- > 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(-) > > diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c > index fa4de9a..ce37af2 100644 > --- a/arch/arm/mach-imx/clk-imx51-imx53.c > +++ b/arch/arm/mach-imx/clk-imx51-imx53.c > @@ -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
diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c index fa4de9a..ce37af2 100644 --- a/arch/arm/mach-imx/clk-imx51-imx53.c +++ b/arch/arm/mach-imx/clk-imx51-imx53.c @@ -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);