On Monday, October 20, 2014 09:12:50 PM Guenter Roeck wrote: > Register with kernel poweroff handler instead of setting pm_power_off > directly. Register with high priority to reflect that the driver explicitly > overrides existing poweroff handlers. > > Cc: Rafael J. Wysocki <[email protected]> > Cc: Len Brown <[email protected]> > Signed-off-by: Guenter Roeck <[email protected]> > --- > v2: > - Use define to specify poweroff handler priority > - Use pr_warn instead of pr_err > > drivers/acpi/sleep.c | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c > index 05a31b5..1eba563 100644 > --- a/drivers/acpi/sleep.c > +++ b/drivers/acpi/sleep.c > @@ -16,6 +16,8 @@ > #include <linux/device.h> > #include <linux/interrupt.h> > #include <linux/suspend.h> > +#include <linux/notifier.h> > +#include <linux/pm.h> > #include <linux/reboot.h> > #include <linux/acpi.h> > #include <linux/module.h> > @@ -827,14 +829,22 @@ static void acpi_power_off_prepare(void) > acpi_disable_all_gpes(); > } > > -static void acpi_power_off(void) > +static int acpi_power_off(struct notifier_block *this, > + unsigned long unused1, void *unused2) > { > /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */ > printk(KERN_DEBUG "%s called\n", __func__); > local_irq_disable(); > acpi_enter_sleep_state(ACPI_STATE_S5); > + > + return NOTIFY_DONE; > } > > +static struct notifier_block acpi_poweroff_nb = { > + .notifier_call = acpi_power_off, > + .priority = POWEROFF_PRIORITY_HIGH, > +}; > + > int __init acpi_sleep_init(void) > { > char supported[ACPI_S_STATE_COUNT * 3 + 1]; > @@ -851,7 +861,8 @@ int __init acpi_sleep_init(void) > if (acpi_sleep_state_supported(ACPI_STATE_S5)) { > sleep_states[ACPI_STATE_S5] = 1; > pm_power_off_prepare = acpi_power_off_prepare; > - pm_power_off = acpi_power_off; > + if (register_power_off_handler(&acpi_poweroff_nb)) > + pr_warn("acpi: Failed to register poweroff handler\n");
Please always spell "ACPI" in capitals in kernel messages. > } > > supported[0] = 0; > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
