[PATCH v8 24/27] reboot: Remove pm_power_off_prepare()

Dmitry Osipenko
2022-05-09T23:37:48Z

All pm_power_off_prepare() users were converted to sys-off handler API.
Remove the obsolete global callback variable.

Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
---
include/linux/pm.h | 1 -
kernel/reboot.c | 19 -------------------
2 files changed, 20 deletions(-)

diff --git a/include/linux/pm.h b/include/linux/pm.h
index 70ec69d8bafd..871c9c49ec9d 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -21,7 +21,6 @@
* Callbacks for platform drivers to implement.
*/
extern void (*pm_power_off)(void);
-extern void (*pm_power_off_prepare)(void);

struct device; /* we have a circular dep with device.h */
#ifdef CONFIG_VT_CONSOLE_SLEEP
diff --git a/kernel/reboot.c b/kernel/reboot.c
index e74103f2a801..66033e12e8eb 100644
--- a/kernel/reboot.c
+++ b/kernel/reboot.c
@@ -63,13 +63,6 @@ struct sys_off_handler {
*/
void __weak (*pm_power_off)(void);

-/*
- * If set, this is used for preparing the system to power off.
- */
-
-void (*pm_power_off_prepare)(void);
-EXPORT_SYMBOL_GPL(pm_power_off_prepare);
-
/**
* emergency_restart - reboot the system
*
@@ -524,14 +517,6 @@ void unregister_platform_power_off(void (*power_off)(void))
}
EXPORT_SYMBOL_GPL(unregister_platform_power_off);

-static int legacy_pm_power_off_prepare(struct sys_off_data *data)
-{
- if (pm_power_off_prepare)
- pm_power_off_prepare();
-
- return NOTIFY_DONE;
-}
-
static int legacy_pm_power_off(struct sys_off_data *data)
{
if (pm_power_off)
@@ -549,10 +534,6 @@ static int legacy_pm_power_off(struct sys_off_data *data)
*/
static int __init legacy_pm_init(void)
{
- register_sys_off_handler(SYS_OFF_MODE_POWER_OFF_PREPARE,
- SYS_OFF_PRIO_DEFAULT,
- legacy_pm_power_off_prepare, NULL);
-
register_sys_off_handler(SYS_OFF_MODE_POWER_OFF, SYS_OFF_PRIO_DEFAULT,
legacy_pm_power_off, NULL);

--
2.35.1