From mboxrd@z Thu Jan 1 00:00:00 1970 From: swarren@wwwdotorg.org (Stephen Warren) Date: Wed, 30 Jan 2013 09:30:28 -0700 Subject: [PATCH] ARM: imx: fix imx31-dt.c time-related warning In-Reply-To: <20130130060329.GB24450@S2100-06.ap.freescale.net> References: <1359518177-21245-1-git-send-email-swarren@wwwdotorg.org> <20130130060329.GB24450@S2100-06.ap.freescale.net> Message-ID: <51094AA4.6040001@wwwdotorg.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 >> >> 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 >> Signed-off-by: Stephen Warren > > Acked-by: Shawn Guo > >> --- >> 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.