Patchwork [linux-next] ARM: keystone: fix compilation warning

login
register
mail settings
Submitter Vincent Stehlé
Date June 27, 2013, 12:49 p.m.
Message ID <1372337367-6708-1-git-send-email-vincent.stehle@freescale.com>
Download mbox | patch
Permalink /patch/255043/
State New
Headers show

Comments

Vincent Stehlé - June 27, 2013, 12:49 p.m.
Fix the following compilation warning:

  arch/arm/mach-keystone/keystone.c:74:2: warning: initialization from incompatible pointer type [enabled by default]
  arch/arm/mach-keystone/keystone.c:74:2: warning: (near initialization for ‘__mach_desc_KEYSTONE.restart’) [enabled by default]

Signed-off-by: Vincent Stehlé <vincent.stehle@freescale.com>
Cc: Robin Holt <holt@sgi.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: trivial@kernel.org
---


Hi,

This warning was seen on linux-next tag next-20130627, with config ARM
multi_v7_defconfig.

Best regards,

V.


 arch/arm/mach-keystone/keystone.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Stephen Rothwell - June 28, 2013, 12:23 a.m.
Hi Vincent,

On Thu, 27 Jun 2013 14:49:27 +0200 Vincent Stehlé <vincent.stehle@freescale.com> wrote:
>
> Fix the following compilation warning:
> 
>   arch/arm/mach-keystone/keystone.c:74:2: warning: initialization from incompatible pointer type [enabled by default]
>   arch/arm/mach-keystone/keystone.c:74:2: warning: (near initialization for ‘__mach_desc_KEYSTONE.restart’) [enabled by default]
> 
> Signed-off-by: Vincent Stehlé <vincent.stehle@freescale.com>
> Cc: Robin Holt <holt@sgi.com>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: trivial@kernel.org
> ---
> 
> 
> Hi,
> 
> This warning was seen on linux-next tag next-20130627, with config ARM
> multi_v7_defconfig.

This is only needed after the merge of the akpm tree, so I will add it
there for today.

> Best regards,
> 
> V.
> 
> 
>  arch/arm/mach-keystone/keystone.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
> index fe4d9ff..b661c5c 100644
> --- a/arch/arm/mach-keystone/keystone.c
> +++ b/arch/arm/mach-keystone/keystone.c
> @@ -49,7 +49,7 @@ static const char *keystone_match[] __initconst = {
>  	NULL,
>  };
>  
> -void keystone_restart(char mode, const char *cmd)
> +void keystone_restart(enum reboot_mode mode, const char *cmd)
>  {
>  	u32 val;
>
Stephen Rothwell - June 28, 2013, 12:36 a.m.
Hi all,

On Fri, 28 Jun 2013 10:23:08 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> This is only needed after the merge of the akpm tree, so I will add it
> there for today.

I changed my mind and applied Arnd's patch instead (see my other reply).

Patch

diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index fe4d9ff..b661c5c 100644
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -49,7 +49,7 @@  static const char *keystone_match[] __initconst = {
 	NULL,
 };
 
-void keystone_restart(char mode, const char *cmd)
+void keystone_restart(enum reboot_mode mode, const char *cmd)
 {
 	u32 val;