From 5e3aa527c390377cdeea444f14ef5a28a0aab618 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 5 Nov 2011 12:36:40 +0000 Subject: ARM: restart: remove comments about adding code to arch_reset() arch_reset() is deprecated; systems should hook into system restart via the 'restart' method in the platforms machine description record. Acked-by: Nicolas Pitre Acked-by: Jamie Iles Acked-by: Tony Lindgren Signed-off-by: Russell King --- arch/arm/mach-picoxcell/include/mach/system.h | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-picoxcell') diff --git a/arch/arm/mach-picoxcell/include/mach/system.h b/arch/arm/mach-picoxcell/include/mach/system.h index 67c589b0c1b..a12da634fdd 100644 --- a/arch/arm/mach-picoxcell/include/mach/system.h +++ b/arch/arm/mach-picoxcell/include/mach/system.h @@ -25,7 +25,6 @@ static inline void arch_idle(void) static inline void arch_reset(int mode, const char *cmd) { - /* Watchdog reset to go here. */ } #endif /* __ASM_ARCH_SYSTEM_H */ -- cgit v1.2.3-18-g5258 From f88b8979d26615ce68772cebc85c3b556571afca Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 5 Nov 2011 21:30:00 +0000 Subject: 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: Nicolas Pitre Acked-by: H Hartley Sweeten Acked-by: Jamie Iles Acked-by: Tony Lindgren Acked-by: Linus Walleij Signed-off-by: Russell King --- arch/arm/mach-picoxcell/include/mach/system.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'arch/arm/mach-picoxcell') diff --git a/arch/arm/mach-picoxcell/include/mach/system.h b/arch/arm/mach-picoxcell/include/mach/system.h index a12da634fdd..1a5d8cb57df 100644 --- a/arch/arm/mach-picoxcell/include/mach/system.h +++ b/arch/arm/mach-picoxcell/include/mach/system.h @@ -23,8 +23,4 @@ static inline void arch_idle(void) cpu_do_idle(); } -static inline void arch_reset(int mode, const char *cmd) -{ -} - #endif /* __ASM_ARCH_SYSTEM_H */ -- cgit v1.2.3-18-g5258