Commit f88b8979 authored by Russell King's avatar Russell King

ARM: restart: remove the now empty arch_reset()

Remove the now empty arch_reset() from all the mach/system.h includes,
and remove its callsite.  Remove arm_machine_restart() as this function
no longer does anything useful.

For samsung platforms, remove the include of mach/system-reset.h and
plat/system-reset.h from their respective mach/system.h headers as these
just define their arch_reset functions.  As a result, the s3c2410 and
plat-samsung system-reset.h files are no longer referenced, so remove
these files entirely.
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Acked-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: default avatarJamie Iles <jamie@jamieiles.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 5e3aa527
...@@ -100,7 +100,6 @@ extern void __show_regs(struct pt_regs *); ...@@ -100,7 +100,6 @@ extern void __show_regs(struct pt_regs *);
extern int __pure cpu_architecture(void); extern int __pure cpu_architecture(void);
extern void cpu_init(void); extern void cpu_init(void);
void arm_machine_restart(char mode, const char *cmd);
void soft_restart(unsigned long); void soft_restart(unsigned long);
extern void (*arm_pm_restart)(char str, const char *cmd); extern void (*arm_pm_restart)(char str, const char *cmd);
......
...@@ -117,14 +117,8 @@ void soft_restart(unsigned long addr) ...@@ -117,14 +117,8 @@ void soft_restart(unsigned long addr)
cpu_reset(addr); cpu_reset(addr);
} }
void arm_machine_restart(char mode, const char *cmd) static void null_restart(char mode, const char *cmd)
{ {
/* Disable interrupts first */
local_irq_disable();
local_fiq_disable();
/* Call the architecture specific reboot code. */
arch_reset(mode, cmd);
} }
/* /*
...@@ -133,7 +127,7 @@ void arm_machine_restart(char mode, const char *cmd) ...@@ -133,7 +127,7 @@ void arm_machine_restart(char mode, const char *cmd)
void (*pm_power_off)(void); void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off); EXPORT_SYMBOL(pm_power_off);
void (*arm_pm_restart)(char str, const char *cmd) = arm_machine_restart; void (*arm_pm_restart)(char str, const char *cmd) = null_restart;
EXPORT_SYMBOL_GPL(arm_pm_restart); EXPORT_SYMBOL_GPL(arm_pm_restart);
static void do_nothing(void *unused) static void do_nothing(void *unused)
......
...@@ -47,8 +47,4 @@ static inline void arch_idle(void) ...@@ -47,8 +47,4 @@ static inline void arch_idle(void)
#endif #endif
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -25,8 +25,4 @@ static inline void arch_idle(void) ...@@ -25,8 +25,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -32,8 +32,4 @@ static inline void arch_idle(void) ...@@ -32,8 +32,4 @@ static inline void arch_idle(void)
mov r0, r0"); mov r0, r0");
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -22,8 +22,4 @@ static inline void arch_idle(void) ...@@ -22,8 +22,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -18,8 +18,4 @@ static inline void arch_idle(void) ...@@ -18,8 +18,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif /* __ASM_ARCH_SYSTEM_H */ #endif /* __ASM_ARCH_SYSTEM_H */
...@@ -14,9 +14,4 @@ static inline void arch_idle(void) ...@@ -14,9 +14,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -34,8 +34,4 @@ static inline void arch_idle(void) ...@@ -34,8 +34,4 @@ static inline void arch_idle(void)
asm volatile ("mcr p15, 0, ip, c15, c1, 2" : : : "cc"); asm volatile ("mcr p15, 0, ip, c15, c1, 2" : : : "cc");
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -5,7 +5,3 @@ static inline void arch_idle(void) ...@@ -5,7 +5,3 @@ static inline void arch_idle(void)
{ {
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
#ifndef __ASM_ARCH_SYSTEM_H #ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H __FILE__ #define __ASM_ARCH_SYSTEM_H __FILE__
#include <plat/system-reset.h>
static void arch_idle(void) static void arch_idle(void)
{ {
/* nothing here yet */ /* nothing here yet */
......
...@@ -11,7 +11,3 @@ static inline void arch_idle(void) ...@@ -11,7 +11,3 @@ static inline void arch_idle(void)
{ {
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
...@@ -24,8 +24,4 @@ static void arch_idle(void) ...@@ -24,8 +24,4 @@ static void arch_idle(void)
nop(); nop();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -21,8 +21,4 @@ static inline void arch_idle(void) ...@@ -21,8 +21,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -30,8 +30,4 @@ static inline void arch_idle(void) ...@@ -30,8 +30,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -11,7 +11,3 @@ static inline void arch_idle(void) ...@@ -11,7 +11,3 @@ static inline void arch_idle(void)
{ {
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
...@@ -11,7 +11,3 @@ static inline void arch_idle(void) ...@@ -11,7 +11,3 @@ static inline void arch_idle(void)
{ {
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
...@@ -11,7 +11,3 @@ static inline void arch_idle(void) ...@@ -11,7 +11,3 @@ static inline void arch_idle(void)
{ {
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
...@@ -12,7 +12,3 @@ static inline void arch_idle(void) ...@@ -12,7 +12,3 @@ static inline void arch_idle(void)
{ {
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
...@@ -14,7 +14,3 @@ static inline void arch_idle(void) ...@@ -14,7 +14,3 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
#endif #endif
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
...@@ -17,7 +17,3 @@ static inline void arch_idle(void) ...@@ -17,7 +17,3 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
#endif #endif
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
...@@ -14,8 +14,4 @@ static inline void arch_idle(void) ...@@ -14,8 +14,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -24,8 +24,4 @@ static void arch_idle(void) ...@@ -24,8 +24,4 @@ static void arch_idle(void)
} }
static void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -24,8 +24,4 @@ static void arch_idle(void) ...@@ -24,8 +24,4 @@ static void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -13,8 +13,4 @@ static inline void arch_idle(void) ...@@ -13,8 +13,4 @@ static inline void arch_idle(void)
{ {
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif /* __ASM_MACH_SYSTEM_H */ #endif /* __ASM_MACH_SYSTEM_H */
...@@ -14,10 +14,6 @@ ...@@ -14,10 +14,6 @@
*/ */
void arch_idle(void); void arch_idle(void);
static inline void arch_reset(char mode, const char *cmd)
{
}
/* low level hardware reset hook -- for example, hitting the /* low level hardware reset hook -- for example, hitting the
* PSHOLD line on the PMIC to hard reset the system * PSHOLD line on the PMIC to hard reset the system
*/ */
......
...@@ -14,9 +14,4 @@ static inline void arch_idle(void) ...@@ -14,9 +14,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -22,8 +22,4 @@ static inline void arch_idle(void) ...@@ -22,8 +22,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif /* __MACH_MXS_SYSTEM_H__ */ #endif /* __MACH_MXS_SYSTEM_H__ */
...@@ -24,9 +24,5 @@ static inline void arch_idle(void) ...@@ -24,9 +24,5 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -29,8 +29,4 @@ static inline void arch_idle(void) ...@@ -29,8 +29,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -16,8 +16,4 @@ static inline void arch_idle(void) ...@@ -16,8 +16,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -23,8 +23,4 @@ static inline void arch_idle(void) ...@@ -23,8 +23,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(int mode, const char *cmd)
{
}
#endif /* __ASM_ARCH_SYSTEM_H */ #endif /* __ASM_ARCH_SYSTEM_H */
...@@ -26,8 +26,4 @@ static void arch_idle(void) ...@@ -26,8 +26,4 @@ static void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -14,8 +14,4 @@ static inline void arch_idle(void) ...@@ -14,8 +14,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -13,7 +13,3 @@ static inline void arch_idle(void) ...@@ -13,7 +13,3 @@ static inline void arch_idle(void)
{ {
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
...@@ -30,8 +30,4 @@ static inline void arch_idle(void) ...@@ -30,8 +30,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -11,7 +11,3 @@ static inline void arch_idle(void) ...@@ -11,7 +11,3 @@ static inline void arch_idle(void)
{ {
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
/* arch/arm/mach-s3c2410/include/mach/system-reset.h
*
* Copyright (c) 2008 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
*
* S3C2410 - System define for arch_reset() function
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
static void arch_reset(char mode, const char *cmd)
{
}
...@@ -52,5 +52,3 @@ static void arch_idle(void) ...@@ -52,5 +52,3 @@ static void arch_idle(void)
else else
s3c24xx_default_idle(); s3c24xx_default_idle();
} }
#include <mach/system-reset.h>
...@@ -16,8 +16,4 @@ static void arch_idle(void) ...@@ -16,8 +16,4 @@ static void arch_idle(void)
/* nothing here yet */ /* nothing here yet */
} }
static void arch_reset(char mode, const char *cmd)
{
}
#endif /* __ASM_ARCH_IRQ_H */ #endif /* __ASM_ARCH_IRQ_H */
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
#ifndef __ASM_ARCH_SYSTEM_H #ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H __FILE__ #define __ASM_ARCH_SYSTEM_H __FILE__
#include <plat/system-reset.h>
static void arch_idle(void) static void arch_idle(void)
{ {
/* nothing here yet */ /* nothing here yet */
......
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
#ifndef __ASM_ARCH_SYSTEM_H #ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H __FILE__ #define __ASM_ARCH_SYSTEM_H __FILE__
#include <plat/system-reset.h>
static void arch_idle(void) static void arch_idle(void)
{ {
/* nothing here yet */ /* nothing here yet */
......
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
#ifndef __ASM_ARCH_SYSTEM_H #ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H __FILE__ #define __ASM_ARCH_SYSTEM_H __FILE__
#include <plat/system-reset.h>
static void arch_idle(void) static void arch_idle(void)
{ {
/* nothing here yet */ /* nothing here yet */
......
...@@ -7,7 +7,3 @@ static inline void arch_idle(void) ...@@ -7,7 +7,3 @@ static inline void arch_idle(void)
{ {
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
...@@ -6,10 +6,6 @@ ...@@ -6,10 +6,6 @@
#ifndef __ASM_ARCH_SYSTEM_H #ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H
static inline void arch_reset(char mode, const char *cmd)
{
}
static inline void arch_idle(void) static inline void arch_idle(void)
{ {
} }
......
...@@ -21,10 +21,6 @@ ...@@ -21,10 +21,6 @@
#ifndef __MACH_TEGRA_SYSTEM_H #ifndef __MACH_TEGRA_SYSTEM_H
#define __MACH_TEGRA_SYSTEM_H #define __MACH_TEGRA_SYSTEM_H
static inline void arch_reset(char mode, const char *cmd)
{
}
static inline void arch_idle(void) static inline void arch_idle(void)
{ {
} }
......
...@@ -12,7 +12,3 @@ static inline void arch_idle(void) ...@@ -12,7 +12,3 @@ static inline void arch_idle(void)
{ {
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
...@@ -17,8 +17,4 @@ static inline void arch_idle(void) ...@@ -17,8 +17,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -30,8 +30,4 @@ static inline void arch_idle(void) ...@@ -30,8 +30,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -30,8 +30,4 @@ static inline void arch_idle(void) ...@@ -30,8 +30,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -17,8 +17,3 @@ ...@@ -17,8 +17,3 @@
static void arch_idle(void) static void arch_idle(void)
{ {
} }
static void arch_reset(char mode, const char *cmd)
{
}
...@@ -20,8 +20,4 @@ static inline void arch_idle(void) ...@@ -20,8 +20,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
...@@ -22,8 +22,4 @@ static inline void arch_idle(void) ...@@ -22,8 +22,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif /* __ASM_ARCH_MXC_SYSTEM_H__ */ #endif /* __ASM_ARCH_MXC_SYSTEM_H__ */
...@@ -12,8 +12,4 @@ static inline void arch_idle(void) ...@@ -12,8 +12,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif
/* linux/arch/arm/plat-samsung/include/plat/system-reset.h
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
* Based on arch/arm/mach-s3c2410/include/mach/system-reset.h
*
* S5P - System define for arch_reset()
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <plat/watchdog-reset.h>
static void arch_reset(char mode, const char *cmd)
{
arch_wdt_reset();
}
...@@ -23,8 +23,4 @@ static inline void arch_idle(void) ...@@ -23,8 +23,4 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif /* __PLAT_SYSTEM_H */ #endif /* __PLAT_SYSTEM_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment