Patchwork ARM: imx: fix imx31-dt.c time-related warning

login
register
mail settings
Submitter Stephen Warren
Date Jan. 30, 2013, 3:56 a.m.
Message ID <1359518177-21245-1-git-send-email-swarren@wwwdotorg.org>
Download mbox | patch
Permalink /patch/216762/
State New
Headers show

Comments

Stephen Warren - Jan. 30, 2013, 3:56 a.m.
From: Stephen Warren <swarren@nvidia.com>

Commit 6bb27d7 "ARM: delete struct sys_timer" caused the following:

arch/arm/mach-imx/imx31-dt.c:56:2: warning: initialization from incompatible pointer type [enabled by default]
arch/arm/mach-imx/imx31-dt.c:56:2: warning: (near initialization for ‘__mach_desc_IMX31_DT.init_time’) [enabled by default]

This is because mx31_clocks_init_dt() returns int, whereas the .init_time
field prototype expects a function returning void. Implement a wrapper so
that the prototypes match.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
This patch is based on arm-soc's timer/cleanup branch, which contains
the commit mentioned above.
---
 arch/arm/mach-imx/imx31-dt.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
Shawn Guo - Jan. 30, 2013, 6:03 a.m.
On Tue, Jan 29, 2013 at 08:56:17PM -0700, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> Commit 6bb27d7 "ARM: delete struct sys_timer" caused the following:
> 
> arch/arm/mach-imx/imx31-dt.c:56:2: warning: initialization from incompatible pointer type [enabled by default]
> arch/arm/mach-imx/imx31-dt.c:56:2: warning: (near initialization for ‘__mach_desc_IMX31_DT.init_time’) [enabled by default]
> 
> This is because mx31_clocks_init_dt() returns int, whereas the .init_time
> field prototype expects a function returning void. Implement a wrapper so
> that the prototypes match.
> 
> Reported-by: Fengguang Wu <fengguang.wu@intel.com>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>

Acked-by: Shawn Guo <shawn.guo@linaro.org>

> ---
> This patch is based on arm-soc's timer/cleanup branch, which contains
> the commit mentioned above.

I suppose that it should just be applied by arm-soc folks on that
branch, right?

Shawn
Stephen Warren - Jan. 30, 2013, 4:30 p.m.
On 01/29/2013 11:03 PM, Shawn Guo wrote:
> On Tue, Jan 29, 2013 at 08:56:17PM -0700, Stephen Warren wrote:
>> From: Stephen Warren <swarren@nvidia.com>
>>
>> Commit 6bb27d7 "ARM: delete struct sys_timer" caused the following:
>>
>> arch/arm/mach-imx/imx31-dt.c:56:2: warning: initialization from incompatible pointer type [enabled by default]
>> arch/arm/mach-imx/imx31-dt.c:56:2: warning: (near initialization for ‘__mach_desc_IMX31_DT.init_time’) [enabled by default]
>>
>> This is because mx31_clocks_init_dt() returns int, whereas the .init_time
>> field prototype expects a function returning void. Implement a wrapper so
>> that the prototypes match.
>>
>> Reported-by: Fengguang Wu <fengguang.wu@intel.com>
>> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> 
> Acked-by: Shawn Guo <shawn.guo@linaro.org>
> 
>> ---
>> This patch is based on arm-soc's timer/cleanup branch, which contains
>> the commit mentioned above.
> 
> I suppose that it should just be applied by arm-soc folks on that
> branch, right?

I wasn't sure if the IMX maintainers had any branch based on the
timer/cleanup branch already. On the off-chance you did, I sent the
patch to you. If you don't, I can resend to the arm-soc maintainers.
Shawn Guo - Jan. 31, 2013, 12:24 a.m.
On Wed, Jan 30, 2013 at 09:30:28AM -0700, Stephen Warren wrote:
> I wasn't sure if the IMX maintainers had any branch based on the
> timer/cleanup branch already. On the off-chance you did, I sent the
> patch to you. If you don't, I can resend to the arm-soc maintainers.

I do not.

Shawn
Olof Johansson - Feb. 1, 2013, 3:55 a.m.
On Tue, Jan 29, 2013 at 08:56:17PM -0700, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> Commit 6bb27d7 "ARM: delete struct sys_timer" caused the following:
> 
> arch/arm/mach-imx/imx31-dt.c:56:2: warning: initialization from incompatible pointer type [enabled by default]
> arch/arm/mach-imx/imx31-dt.c:56:2: warning: (near initialization for ‘__mach_desc_IMX31_DT.init_time’) [enabled by default]
> 
> This is because mx31_clocks_init_dt() returns int, whereas the .init_time
> field prototype expects a function returning void. Implement a wrapper so
> that the prototypes match.
> 
> Reported-by: Fengguang Wu <fengguang.wu@intel.com>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> This patch is based on arm-soc's timer/cleanup branch, which contains
> the commit mentioned above.


Applied.

-Olof

Patch

diff --git a/arch/arm/mach-imx/imx31-dt.c b/arch/arm/mach-imx/imx31-dt.c
index f9a6909..b5c04ee 100644
--- a/arch/arm/mach-imx/imx31-dt.c
+++ b/arch/arm/mach-imx/imx31-dt.c
@@ -43,12 +43,17 @@  static const char *imx31_dt_board_compat[] __initdata = {
 	NULL
 };
 
+static void __init imx31_dt_timer_init(void)
+{
+	mx31_clocks_init_dt();
+}
+
 DT_MACHINE_START(IMX31_DT, "Freescale i.MX31 (Device Tree Support)")
 	.map_io		= mx31_map_io,
 	.init_early	= imx31_init_early,
 	.init_irq	= mx31_init_irq,
 	.handle_irq	= imx31_handle_irq,
-	.init_time	= mx31_clocks_init_dt,
+	.init_time	= imx31_dt_timer_init,
 	.init_machine	= imx31_dt_init,
 	.dt_compat	= imx31_dt_board_compat,
 	.restart	= mxc_restart,