Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f88b8979 authored by Russell King's avatar Russell King
Browse files

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

arch/arm/include/asm/system.h

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ extern void __show_regs(struct pt_regs *); 
extern int __pure cpu_architecture(void);

extern void cpu_init(void);



void arm_machine_restart(char mode, const char *cmd);

void soft_restart(unsigned long);

extern void (*arm_pm_restart)(char str, const char *cmd);

arch/arm/kernel/process.c

+2 −8
Original line number Diff line number Diff line
@@ -117,14 +117,8 @@ void soft_restart(unsigned long 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) 
void (*pm_power_off)(void);

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);



static void do_nothing(void *unused)

arch/arm/mach-at91/include/mach/system.h

+0 −4
Original line number Diff line number Diff line
@@ -47,8 +47,4 @@ static inline void arch_idle(void) 
#endif

}



static inline void arch_reset(char mode, const char *cmd)

{

}



#endif

arch/arm/mach-bcmring/include/mach/system.h

+0 −4
Original line number Diff line number Diff line
@@ -25,8 +25,4 @@ static inline void arch_idle(void) 
	cpu_do_idle();

}



static inline void arch_reset(char mode, const char *cmd)

{

}



#endif

arch/arm/mach-clps711x/include/mach/system.h

+0 −4
Original line number Diff line number Diff line
@@ -32,8 +32,4 @@ static inline void arch_idle(void) 
	mov	r0, r0");

}



static inline void arch_reset(char mode, const char *cmd)

{

}



#endif