From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bh-25.webhostbox.net (bh-25.webhostbox.net [208.91.199.152]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id B6D5A1A0B41 for ; Tue, 7 Oct 2014 16:30:26 +1100 (EST) Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1XbNLs-002fCJ-DL for linuxppc-dev@lists.ozlabs.org; Tue, 07 Oct 2014 05:30:24 +0000 From: Guenter Roeck To: linux-kernel@vger.kernel.org Subject: [PATCH 28/44] x86: olpc: Register xo1 poweroff handler with kernel poweroff handler Date: Mon, 6 Oct 2014 22:28:30 -0700 Message-Id: <1412659726-29957-29-git-send-email-linux@roeck-us.net> In-Reply-To: <1412659726-29957-1-git-send-email-linux@roeck-us.net> References: <1412659726-29957-1-git-send-email-linux@roeck-us.net> Cc: linux-m32r-ja@ml.linux-m32r.org, linux-mips@linux-mips.org, linux-efi@vger.kernel.org, linux-ia64@vger.kernel.org, linux-xtensa@linux-xtensa.org, "H. Peter Anvin" , Thomas Gleixner , devel@driverdev.osuosl.org, linux-s390@vger.kernel.org, lguest@lists.ozlabs.org, linux-c6x-dev@linux-c6x.org, linux-hexagon@vger.kernel.org, linux-sh@vger.kernel.org, linux-acpi@vger.kernel.org, Ingo Molnar , xen-devel@lists.xenproject.org, Guenter Roeck , devicetree@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net, linux-pm@vger.kernel.org, adi-buildroot-devel@lists.sourceforge.net, linux-m68k@lists.linux-m68k.org, linux-am33-list@redhat.com, linux-tegra@vger.kernel.org, openipmi-developer@lists.sourceforge.net, linux-metag@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-parisc@vger.kernel.org, linux-cris-kernel@axis.com, linux-alpha@vger.kernel.org, linuxppc-dev@lists.ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Register with kernel poweroff handler instead of setting pm_power_off directly. Register with high priority value of 192 to reflect that the driver explicitly wants to override default poweroff handlers. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: H. Peter Anvin Signed-off-by: Guenter Roeck --- arch/x86/platform/olpc/olpc-xo1-pm.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/arch/x86/platform/olpc/olpc-xo1-pm.c b/arch/x86/platform/olpc/olpc-xo1-pm.c index a9acde7..96fba36 100644 --- a/arch/x86/platform/olpc/olpc-xo1-pm.c +++ b/arch/x86/platform/olpc/olpc-xo1-pm.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -92,7 +93,8 @@ asmlinkage __visible int xo1_do_sleep(u8 sleep_state) return 0; } -static void xo1_power_off(void) +static int xo1_power_off(struct notifier_block *this, unsigned long unused1, + void *unused2) { printk(KERN_INFO "OLPC XO-1 power off sequence...\n"); @@ -108,8 +110,15 @@ static void xo1_power_off(void) /* Write SLP_EN bit to start the machinery */ outl(0x00002000, acpi_base + CS5536_PM1_CNT); + + return NOTIFY_DONE; } +static struct notifier_block xo1_poweroff_nb = { + .notifier_call = xo1_power_off, + .priority = 192, +}; + static int xo1_power_state_valid(suspend_state_t pm_state) { /* suspend-to-RAM only */ @@ -146,8 +155,12 @@ static int xo1_pm_probe(struct platform_device *pdev) /* If we have both addresses, we can override the poweroff hook */ if (pms_base && acpi_base) { + err = register_poweroff_handler(&xo1_poweroff_nb); + if (err) { + dev_err(&pdev->dev, "Failed to register poweroff handler\n"); + return err; + } suspend_set_ops(&xo1_suspend_ops); - pm_power_off = xo1_power_off; printk(KERN_INFO "OLPC XO-1 support registered\n"); } @@ -158,12 +171,13 @@ static int xo1_pm_remove(struct platform_device *pdev) { mfd_cell_disable(pdev); + unregister_poweroff_handler(&xo1_poweroff_nb); + if (strcmp(pdev->name, "cs5535-pms") == 0) pms_base = 0; else if (strcmp(pdev->name, "olpc-xo1-pm-acpi") == 0) acpi_base = 0; - pm_power_off = NULL; return 0; } -- 1.9.1