Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755495AbaJUMGg (ORCPT ); Tue, 21 Oct 2014 08:06:36 -0400 Received: from v094114.home.net.pl ([79.96.170.134]:58948 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755191AbaJUMGf (ORCPT ); Tue, 21 Oct 2014 08:06:35 -0400 From: "Rafael J. Wysocki" To: Guenter Roeck Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Len Brown , linux-acpi@vger.kernel.org Subject: Re: [PATCH v2 34/47] acpi: Register poweroff handler with kernel poweroff handler Date: Tue, 21 Oct 2014 14:27 +0200 Message-ID: <1453445.HGtlG6JTvO@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/3.16.0-rc5+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1413864783-3271-35-git-send-email-linux@roeck-us.net> References: <1413864783-3271-1-git-send-email-linux@roeck-us.net> <1413864783-3271-35-git-send-email-linux@roeck-us.net> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > Cc: Len Brown > Signed-off-by: Guenter Roeck > --- > 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 > #include > #include > +#include > +#include > #include > #include > #include > @@ -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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/