From: Thierry Reding <thierry.reding@gmail•com>
To: Russell King <linux@armlinux•org.uk>, arm@kernel•org
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm•com>,
Arnd Bergmann <arnd@arndb•de>,
Stefano Stabellini <stefano.stabellini@eu•citrix.com>,
Catalin Marinas <catalin.marinas@arm•com>,
linux-kernel@vger•kernel.org, Stefan Agner <stefan@agner•ch>,
Wolfram Sang <wsa+renesas@sang-engineering•com>,
linux-arm-kernel@lists•infradead.org,
Olof Johansson <olof@lixom•net>,
Guenter Roeck <linux@roeck-us•net>
Subject: [PATCH 6/6] ARM: Remove arm_pm_restart()
Date: Tue, 15 Oct 2019 16:51:47 +0200 [thread overview]
Message-ID: <20191015145147.1106247-7-thierry.reding@gmail.com> (raw)
In-Reply-To: <20191015145147.1106247-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 66f6a3ae68d2..98b37340376b 100644
--- a/arch/arm/include/asm/system_misc.h
+++ b/arch/arm/include/asm/system_misc.h
@@ -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
diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c
index bb18ed0539f4..1076b26aa699 100644
--- a/arch/arm/kernel/reboot.c
+++ b/arch/arm/kernel/reboot.c
@@ -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,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.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-10-15 14:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-15 14:51 [PATCH 0/6] ARM/arm64: arm_pm_restart removal Thierry Reding
2019-10-15 14:51 ` [PATCH 1/6] ARM: prima2: Register with kernel restart handler Thierry Reding
2019-10-15 14:51 ` [PATCH 2/6] ARM: xen: " Thierry Reding
[not found] ` <CAF2Aj3hbW7+pNp+_jnMVL8zeSxAvSbV1ZFZ_4PAUj6J0TxMk7g@mail.gmail.com>
2021-06-03 13:11 ` Guenter Roeck
2021-06-03 13:38 ` Lee Jones
2021-06-03 13:48 ` Boris Ostrovsky
2021-06-03 13:56 ` Russell King (Oracle)
2021-06-03 14:03 ` Lee Jones
2021-06-03 14:10 ` Russell King (Oracle)
2021-06-03 14:20 ` Thierry Reding
2021-06-03 13:45 ` Russell King (Oracle)
2019-10-15 14:51 ` [PATCH 3/6] drivers: firmware: psci: " Thierry Reding
2019-10-16 7:46 ` Stefan Agner
2019-10-15 14:51 ` [PATCH 4/6] ARM: " Thierry Reding
2019-10-15 14:51 ` [PATCH 5/6] ARM64: Remove arm_pm_restart() Thierry Reding
2019-10-15 14:51 ` Thierry Reding [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-01-30 11:05 [PATCH 0/6] ARM, arm64: " Thierry Reding
2017-01-30 11:05 ` [PATCH 6/6] ARM: " 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=20191015145147.1106247-7-thierry.reding@gmail.com \
--to=thierry.reding@gmail$(echo .)com \
--cc=arm@kernel$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=catalin.marinas@arm$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux@armlinux$(echo .)org.uk \
--cc=linux@roeck-us$(echo .)net \
--cc=lorenzo.pieralisi@arm$(echo .)com \
--cc=olof@lixom$(echo .)net \
--cc=stefan@agner$(echo .)ch \
--cc=stefano.stabellini@eu$(echo .)citrix.com \
--cc=wsa+renesas@sang-engineering$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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