Commit 33f08757 authored Jun 04, 2021 by Guenter Roeck Committed by Russell King (Oracle) Jun 13, 2021

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>

parent ab6cef1d

arch/arm/include/asm/system_misc.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,6 @@
		extern void cpu_init(void);

		void soft_restart(unsigned long);
		extern void (arm_pm_restart)(enum reboot_mode reboot_mode, const char cmd);
		extern void (*arm_pm_idle)(void);

		#ifdef CONFIG_HARDEN_BRANCH_PREDICTOR

arch/arm/kernel/reboot.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ typedef void (*phys_reset_t)(unsigned long, bool);
		/*
		* Function pointers to optional machine specific functions
		*/
		void (arm_pm_restart)(enum reboot_mode reboot_mode, const char cmd);
		void (*pm_power_off)(void);
		EXPORT_SYMBOL(pm_power_off);

		@@ -138,9 +137,6 @@ void machine_restart(char *cmd)
		local_irq_disable();
		smp_send_stop();

		if (arm_pm_restart)
		arm_pm_restart(reboot_mode, cmd);
		else
		do_kernel_restart(cmd);

		/* Give a grace period for failure to restart of 1s */