Skip to content

Commit

Permalink
reboot: Remove pm_power_off_prepare()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitry Osipenko authored and Rafael J. Wysocki committed May 19, 2022
1 parent 02a1124 commit 5b71808
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 20 deletions.
1 change: 0 additions & 1 deletion include/linux/pm.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 0 additions & 19 deletions kernel/reboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -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)
Expand All @@ -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);

Expand Down

0 comments on commit 5b71808

Please sign in to comment.