Skip to content

Commit 33f0875

Browse files
groeckRussell King (Oracle)
authored andcommitted
ARM: 9096/1: Remove arm_pm_restart()
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>
1 parent ab6cef1 commit 33f0875

2 files changed

Lines changed: 1 addition & 6 deletions

File tree

arch/arm/include/asm/system_misc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
extern void cpu_init(void);
1414

1515
void soft_restart(unsigned long);
16-
extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);
1716
extern void (*arm_pm_idle)(void);
1817

1918
#ifdef CONFIG_HARDEN_BRANCH_PREDICTOR

arch/arm/kernel/reboot.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ typedef void (*phys_reset_t)(unsigned long, bool);
1818
/*
1919
* Function pointers to optional machine specific functions
2020
*/
21-
void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);
2221
void (*pm_power_off)(void);
2322
EXPORT_SYMBOL(pm_power_off);
2423

@@ -138,10 +137,7 @@ void machine_restart(char *cmd)
138137
local_irq_disable();
139138
smp_send_stop();
140139

141-
if (arm_pm_restart)
142-
arm_pm_restart(reboot_mode, cmd);
143-
else
144-
do_kernel_restart(cmd);
140+
do_kernel_restart(cmd);
145141

146142
/* Give a grace period for failure to restart of 1s */
147143
mdelay(1000);

0 commit comments

Comments
 (0)