From: Thierry Reding <thierry.reding@gmail.com>
To: Russell King <linux@armlinux.org.uk>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>, Arnd Bergmann <arnd@arndb.de>
Cc: Mark Rutland <mark.rutland@arm.com>,
Guenter Roeck <linux@roeck-us.net>,
Stefano Stabellini <sstabellini@kernel.org>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 6/6] ARM: Remove arm_pm_restart()
Date: Mon, 30 Jan 2017 12:05:12 +0100 [thread overview]
Message-ID: <20170130110512.6943-7-thierry.reding@gmail.com> (raw)
In-Reply-To: <20170130110512.6943-1-thierry.reding@gmail.com>
From: Guenter Roeck <linux@roeck-us.net>
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>
---
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 3fa867a2aae6..0207ec69045e 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);
@@ -138,10 +137,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.11.0
next prev parent reply other threads:[~2017-01-30 11:07 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-30 11:05 [PATCH 0/6] ARM, arm64: Remove arm_pm_restart() Thierry Reding
2017-01-30 11:05 ` [PATCH 1/6] ARM: prima2: Register with kernel restart handler Thierry Reding
2017-01-30 11:05 ` [PATCH 2/6] ARM: xen: " Thierry Reding
2017-01-30 11:05 ` [PATCH 3/6] drivers: firmware: psci: " Thierry Reding
2017-01-30 11:05 ` [PATCH 4/6] ARM: " Thierry Reding
2017-01-30 11:05 ` [PATCH 5/6] ARM64: Remove arm_pm_restart() Thierry Reding
2017-01-30 11:05 ` Thierry Reding [this message]
2019-09-14 15:25 ` [PATCH 0/6] ARM, arm64: " Guenter Roeck
2019-09-16 7:49 ` Arnd Bergmann
2019-09-16 13:17 ` Guenter Roeck
2019-09-16 13:49 ` Thierry Reding
2019-09-16 15:43 ` Guenter Roeck
2019-09-16 15:50 ` Thierry Reding
2019-09-16 16:29 ` Arnd Bergmann
2019-09-16 20:28 ` Thierry Reding
2019-09-17 0:41 ` Alexandre Belloni
2019-09-17 7:01 ` Arnd Bergmann
2019-09-17 13:06 ` Guenter Roeck
-- strict thread matches above, loose matches on Subject: below --
2019-10-15 14:51 [PATCH 0/6] ARM/arm64: arm_pm_restart removal Thierry Reding
2019-10-15 14:51 ` [PATCH 6/6] ARM: Remove arm_pm_restart() Thierry Reding
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=20170130110512.6943-7-thierry.reding@gmail.com \
--to=thierry.reding@gmail.com \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linux@roeck-us.net \
--cc=mark.rutland@arm.com \
--cc=sstabellini@kernel.org \
--cc=will.deacon@arm.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox