* [PATCH v2] ARM: mach-imx: clk-imx51-imx53: Remove return value from mx53_clocks_init()
@ 2013-10-09 16:55 Fabio Estevam
2013-10-15 11:24 ` Thierry Reding
0 siblings, 1 reply; 2+ messages in thread
From: Fabio Estevam @ 2013-10-09 16:55 UTC (permalink / raw)
To: linux-arm-kernel
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);
--
1.8.1.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v2] ARM: mach-imx: clk-imx51-imx53: Remove return value from mx53_clocks_init()
2013-10-09 16:55 [PATCH v2] ARM: mach-imx: clk-imx51-imx53: Remove return value from mx53_clocks_init() Fabio Estevam
@ 2013-10-15 11:24 ` Thierry Reding
0 siblings, 0 replies; 2+ messages in thread
From: Thierry Reding @ 2013-10-15 11:24 UTC (permalink / raw)
To: linux-arm-kernel
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
-------------- 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>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-15 11:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-09 16:55 [PATCH v2] ARM: mach-imx: clk-imx51-imx53: Remove return value from mx53_clocks_init() Fabio Estevam
2013-10-15 11:24 ` Thierry Reding
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.