leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: 9096/1: Remove arm_pm_restart()

Browse Source 
All users of arm_pm_restart() have been converted to use the kernel
restart handler.

Acked-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
This commit is contained in:
Guenter Roeck
2021-06-04 15:07:37 +01:00
committed by Russell King (Oracle)
parent ab6cef1d14
commit 33f087577e
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/include/asm/system_misc.h
View File

@@ -13,7 +13,6 @@
extern void cpu_init(void); extern void cpu_init(void);
void soft_restart(unsigned long); void soft_restart(unsigned long);
extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);
extern void (*arm_pm_idle)(void); extern void (*arm_pm_idle)(void);
#ifdef CONFIG_HARDEN_BRANCH_PREDICTOR #ifdef CONFIG_HARDEN_BRANCH_PREDICTOR

6
arch/arm/kernel/reboot.c
View File

@@ -18,7 +18,6 @@ typedef void (*phys_reset_t)(unsigned long, bool);
/* /*
* Function pointers to optional machine specific functions * Function pointers to optional machine specific functions
*/ */
void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);
void (*pm_power_off)(void); void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off); EXPORT_SYMBOL(pm_power_off);
@@ -138,10 +137,7 @@ void machine_restart(char *cmd)
local_irq_disable(); local_irq_disable();
smp_send_stop(); smp_send_stop();
if (arm_pm_restart) do_kernel_restart(cmd);
arm_pm_restart(reboot_mode, cmd);
else
do_kernel_restart(cmd);
/* Give a grace period for failure to restart of 1s */ /* Give a grace period for failure to restart of 1s */
mdelay(1000); mdelay(1000);