All of lore.kernel.org
 help / color / mirror / Atom feed
From: Guenter Roeck <linux@roeck-us.net>
To: Russell King <linux@arm.linux.org.uk>,
	Catalin Marinas <catalin.marinas@arm.com>
Cc: Wolfram Sang <wsa@the-dreams.de>,
	Geert Uytterhoeven <geert@linux-m68k.org>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>
Subject: [PATCH 6/6] ARM: Remove arm_pm_restart
Date: Fri,  8 Apr 2016 05:53:59 -0700	[thread overview]
Message-ID: <1460120039-2497-7-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1460120039-2497-1-git-send-email-linux@roeck-us.net>

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

WARNING: multiple messages have this Message-ID (diff)
From: linux@roeck-us.net (Guenter Roeck)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/6] ARM: Remove arm_pm_restart
Date: Fri,  8 Apr 2016 05:53:59 -0700	[thread overview]
Message-ID: <1460120039-2497-7-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1460120039-2497-1-git-send-email-linux@roeck-us.net>

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

  parent reply	other threads:[~2016-04-08 12:54 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-08 12:53 [PATCH 0/6] ARM/ARM64: Drop arm_pm_restart Guenter Roeck
2016-04-08 12:53 ` Guenter Roeck
2016-04-08 12:53 ` [PATCH 1/6] ARM: prima2: Register with kernel restart handler Guenter Roeck
2016-04-08 12:53   ` Guenter Roeck
2016-04-08 12:53 ` [PATCH 2/6] ARM: xen: " Guenter Roeck
2016-04-08 12:53   ` Guenter Roeck
2016-04-08 12:53   ` Guenter Roeck
2016-04-08 15:22   ` Konrad Rzeszutek Wilk
2016-04-08 18:20     ` Guenter Roeck
2016-04-08 18:20     ` [Xen-devel] " Guenter Roeck
2016-04-08 18:20       ` Guenter Roeck
2016-04-09 23:46   ` Stefano Stabellini
2016-04-09 23:46     ` Stefano Stabellini
2016-04-09 23:56     ` Stefano Stabellini
2016-04-09 23:56       ` Stefano Stabellini
2016-04-09 23:56     ` Stefano Stabellini
2016-04-09 23:46   ` Stefano Stabellini
2016-04-08 12:53 ` [PATCH 3/6] ARM: PSCI: " Guenter Roeck
2016-04-08 12:53   ` Guenter Roeck
2016-04-12 15:36   ` Wolfram Sang
2016-04-12 15:36     ` Wolfram Sang
2016-04-13 11:05   ` Mark Rutland
2016-04-13 11:05     ` Mark Rutland
2016-04-13 11:24     ` Jisheng Zhang
2016-04-13 11:24       ` Jisheng Zhang
2016-04-13 13:10     ` Guenter Roeck
2016-04-13 13:10       ` Guenter Roeck
2016-04-13 13:22       ` Geert Uytterhoeven
2016-04-13 13:22         ` Geert Uytterhoeven
2016-04-14  0:42         ` Guenter Roeck
2016-04-14  0:42           ` Guenter Roeck
2016-04-14  8:52           ` Wolfram Sang
2016-04-14  8:52             ` Wolfram Sang
2016-04-14 13:21             ` Guenter Roeck
2016-04-14 13:21               ` Guenter Roeck
2016-04-14 14:31               ` Wolfram Sang
2016-04-14 14:31                 ` Wolfram Sang
2016-04-08 12:53 ` [PATCH 4/6] ARM: " Guenter Roeck
2016-04-08 12:53   ` Guenter Roeck
2016-04-08 12:53 ` [PATCH 5/6] ARM64: Remove arm_pm_restart Guenter Roeck
2016-04-08 12:53   ` Guenter Roeck
2016-04-12 13:10   ` Catalin Marinas
2016-04-12 13:10     ` Catalin Marinas
2016-04-08 12:53 ` Guenter Roeck [this message]
2016-04-08 12:53   ` [PATCH 6/6] ARM: " Guenter Roeck
2016-04-08 15:44 ` [PATCH 0/6] ARM/ARM64: Drop arm_pm_restart Wolfram Sang
2016-04-08 15:44   ` Wolfram Sang
2016-04-08 20:46 ` Arnd Bergmann
2016-04-08 20:46   ` Arnd Bergmann
2016-04-12 15:41 ` Wolfram Sang
2016-04-12 15:41   ` Wolfram Sang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1460120039-2497-7-git-send-email-linux@roeck-us.net \
    --to=linux@roeck-us.net \
    --cc=catalin.marinas@arm.com \
    --cc=geert@linux-m68k.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=wsa@the-dreams.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.