Skip to content

Commit

Permalink
ARM: gemini: fix compiler warning due wrong data type
Browse files Browse the repository at this point in the history
This patch fixes a compiler warning in gemini_restart()
issued by commit 7b6d864 ("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: 7b6d864 ("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>
  • Loading branch information
Hans Ulli Kroll authored and Arnd Bergmann committed May 12, 2015
1 parent 4c49453 commit 31fc835
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion arch/arm/mach-gemini/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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__ */
4 changes: 3 additions & 1 deletion arch/arm/mach-gemini/reset.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 31fc835

Please sign in to comment.