lkml.org 
[lkml]   [2015]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 048/110] ARM: gemini: fix compiler warning due wrong data type
    Date
    3.16.7-ckt13 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Hans Ulli Kroll <ulli.kroll@googlemail.com>

    commit 31fc835fc787aad38e8985d593f8ad0d18825323 upstream.

    This patch fixes a compiler warning in gemini_restart()
    issued by commit 7b6d864b48d9 ("reboot:arm: reboot_mode
    changes from char to enum reboot_mode").

    arch/arm/mach-gemini/board-rut1xx.c:93:2: warning: initialization from incompatible pointer type

    The warning is harmless, and the patch does not need to
    be backported to stable kernels.

    Fixes: 7b6d864b48d ("reboot:arm: reboot_mode changes from char to enum reboot_mode.")
    Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    arch/arm/mach-gemini/common.h | 4 +++-
    arch/arm/mach-gemini/reset.c | 4 +++-
    2 files changed, 6 insertions(+), 2 deletions(-)

    diff --git a/arch/arm/mach-gemini/common.h b/arch/arm/mach-gemini/common.h
    index 38a45260a7c8..dd883698ff7e 100644
    --- a/arch/arm/mach-gemini/common.h
    +++ b/arch/arm/mach-gemini/common.h
    @@ -12,6 +12,8 @@
    #ifndef __GEMINI_COMMON_H__
    #define __GEMINI_COMMON_H__

    +#include <linux/reboot.h>
    +
    struct mtd_partition;

    extern void gemini_map_io(void);
    @@ -26,6 +28,6 @@ extern int platform_register_pflash(unsigned int size,
    struct mtd_partition *parts,
    unsigned int nr_parts);

    -extern void gemini_restart(char mode, const char *cmd);
    +extern void gemini_restart(enum reboot_mode mode, const char *cmd);

    #endif /* __GEMINI_COMMON_H__ */
    diff --git a/arch/arm/mach-gemini/reset.c b/arch/arm/mach-gemini/reset.c
    index b26659759e27..21a6d6d4f9c4 100644
    --- a/arch/arm/mach-gemini/reset.c
    +++ b/arch/arm/mach-gemini/reset.c
    @@ -14,7 +14,9 @@
    #include <mach/hardware.h>
    #include <mach/global_reg.h>

    -void gemini_restart(char mode, const char *cmd)
    +#include "common.h"
    +
    +void gemini_restart(enum reboot_mode mode, const char *cmd)
    {
    __raw_writel(RESET_GLOBAL | RESET_CPU1,
    IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_RESET);

    \
     
     \ /
      Last update: 2015-06-05 16:41    [W:4.234 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site