Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1374214

[PATCH 6/6] ARM: Remove arm_pm_restart

Show all headers | View raw

All users of arm_pm_restart have been converted to use the kernel restart
handler.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 arch/arm/include/asm/system_misc.h | 1 -
 arch/arm/kernel/reboot.c           | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/arch/arm/include/asm/system_misc.h b/arch/arm/include/asm/system_misc.h
index a3d61ad984af..6c952538f1e8 100644
--- a/arch/arm/include/asm/system_misc.h
+++ b/arch/arm/include/asm/system_misc.h
@@ -11,7 +11,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);
 
 #define UDBG_UNDEFINED	(1 << 0)
diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c
index 71a2ff9ec490..4785c39ee3eb 100644
--- a/arch/arm/kernel/reboot.c
+++ b/arch/arm/kernel/reboot.c
@@ -20,7 +20,6 @@ typedef void (*phys_reset_t)(unsigned long);
 /*
  * 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);
 
@@ -140,10 +139,7 @@ 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);
+	do_kernel_restart(cmd);
 
 	/* Give a grace period for failure to restart of 1s */
 	mdelay(1000);
-- 
2.5.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/6] ARM/ARM64: Drop arm_pm_restart Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
  [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
    Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Wolfram Sang <wsa@the-dreams.de> - 2016-04-12 17:40 +0200
    Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Mark Rutland <mark.rutland@arm.com> - 2016-04-13 13:10 +0200
      Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Jisheng Zhang <jszhang@marvell.com> - 2016-04-13 13:40 +0200
      Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-13 15:20 +0200
        Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Geert Uytterhoeven <geert@linux-m68k.org> - 2016-04-13 15:30 +0200
          Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-14 02:50 +0200
            Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Wolfram Sang <wsa@the-dreams.de> - 2016-04-14 11:00 +0200
              Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-14 15:30 +0200
                Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Wolfram Sang <wsa@the-dreams.de> - 2016-04-14 16:40 +0200
  [PATCH 1/6] ARM: prima2: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
  [PATCH 6/6] ARM: Remove arm_pm_restart Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
  [PATCH 4/6] ARM: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
  [PATCH 5/6] ARM64: Remove arm_pm_restart Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
    Re: [PATCH 5/6] ARM64: Remove arm_pm_restart Catalin Marinas <catalin.marinas@arm.com> - 2016-04-12 15:20 +0200
  Re: [PATCH 0/6] ARM/ARM64: Drop arm_pm_restart Wolfram Sang <wsa@the-dreams.de> - 2016-04-08 17:50 +0200
  Re: [PATCH 0/6] ARM/ARM64: Drop arm_pm_restart Arnd Bergmann <arnd@arndb.de> - 2016-04-08 22:50 +0200
  Re: [PATCH 0/6] ARM/ARM64: Drop arm_pm_restart Wolfram Sang <wsa@the-dreams.de> - 2016-04-12 17:50 +0200

csiph-web