iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reboot: Remove pm_power_off_prepare()

Browse Source 
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>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Dmitry Osipenko 2022-05-10 02:32:32 +03:00 committed by Rafael J. Wysocki
parent 02a1124def
commit 5b71808eb7
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/pm.h
View File

@ -21,7 +21,6 @@
* Callbacks for platform drivers to implement. * Callbacks for platform drivers to implement.
*/ */
extern void (*pm_power_off)(void); extern void (*pm_power_off)(void);
extern void (*pm_power_off_prepare)(void);
struct device; /* we have a circular dep with device.h */ struct device; /* we have a circular dep with device.h */
#ifdef CONFIG_VT_CONSOLE_SLEEP #ifdef CONFIG_VT_CONSOLE_SLEEP

19
kernel/reboot.c
View File

@ -63,13 +63,6 @@ struct sys_off_handler {
*/ */
void __weak (*pm_power_off)(void); 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 * 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); 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) static int legacy_pm_power_off(struct sys_off_data *data)
{ {
if (pm_power_off) 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) 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, register_sys_off_handler(SYS_OFF_MODE_POWER_OFF, SYS_OFF_PRIO_DEFAULT,
legacy_pm_power_off, NULL); legacy_pm_power_off, NULL);