From patchwork Tue Oct 7 05:28:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 5041591 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D62029F295 for ; Tue, 7 Oct 2014 05:33:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 09B0020148 for ; Tue, 7 Oct 2014 05:33:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1CED1201B9 for ; Tue, 7 Oct 2014 05:33:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753120AbaJGFdF (ORCPT ); Tue, 7 Oct 2014 01:33:05 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:41755 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753806AbaJGFba (ORCPT ); Tue, 7 Oct 2014 01:31:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=roeck-us.net; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=B13QiruosJUXTjC1met91TjwbeZT033r9zbwyDVICO0=; b=s/zgqHLQT5/OxdivG5Szff2rVLZOEZBqUmirHezRM4zOoQ1AkUzEzpf8Q+3zlV2/xPO7mZILY7+uNv3ASrayKYHDY72OxWpi6Z0YXnribf9VSJeS0CJCACCYC+vCm1UXHKxykFVi+8L/obQEOU576NxsFh5MOtokA68pZ+IZ2E4=; Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1XbNMw-002mh8-A1 for linux-sh@vger.kernel.org; Tue, 07 Oct 2014 05:31:30 +0000 Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:32907 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.82) (envelope-from ) id 1XbNKv-002aV4-95; Tue, 07 Oct 2014 05:29:25 +0000 From: Guenter Roeck To: linux-kernel@vger.kernel.org Cc: adi-buildroot-devel@lists.sourceforge.net, devel@driverdev.osuosl.org, devicetree@vger.kernel.org, lguest@lists.ozlabs.org, linux-acpi@vger.kernel.org, linux-alpha@vger.kernel.org, linux-am33-list@redhat.com, linux-cris-kernel@axis.com, linux-efi@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-m32r-ja@ml.linux-m32r.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-tegra@vger.kernel.org, linux-xtensa@linux-xtensa.org, openipmi-developer@lists.sourceforge.net, user-mode-linux-devel@lists.sourceforge.net, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-metag@vger.kernel.org, linux-mips@linux-mips.org, linux-parisc@vger.kernel.org, linux-pm@vger.kernel.org, linux-sh@vger.kernel.org, xen-devel@lists.xenproject.org, Guenter Roeck , Linus Walleij , Lee Jones , Samuel Ortiz Subject: [PATCH 12/44] mfd: ab8500-sysctrl: Register with kernel poweroff handler Date: Mon, 6 Oct 2014 22:28:14 -0700 Message-Id: <1412659726-29957-13-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1412659726-29957-1-git-send-email-linux@roeck-us.net> References: <1412659726-29957-1-git-send-email-linux@roeck-us.net> X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=2.8 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, SUSPICIOUS_RECIPS, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY,URIBL_RHS_DOB autolearn=unavailable version=3.3.1 X-CTCH-PVer: 0000001 X-CTCH-Spam: Suspect X-CTCH-VOD: Unknown X-CTCH-Flags: 512 X-CTCH-RefID: str=0001.0A020204.54337AB2.008D, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=512, sb=0 X-CTCH-Score: 0.000 X-CTCH-ScoreCust: 0.000 X-CTCH-Rules: X-CTCH-SenderID: linux@roeck-us.net X-CTCH-SenderID-Flags: 0 X-CTCH-SenderID-TotalMessages: 1216 X-CTCH-SenderID-TotalSpam: 0 X-CTCH-SenderID-TotalSuspected: 130 X-CTCH-SenderID-TotalConfirmed: 0 X-CTCH-SenderID-TotalBulk: 0 X-CTCH-SenderID-TotalVirus: 0 X-CTCH-SenderID-TotalRecipients: 0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: mailgid no entry from get_relayhosts_entry X-Source: X-Source-Args: X-Source-Dir: Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Register with kernel poweroff handler instead of setting pm_power_off directly. Register with a low priority value of 64 to reflect that the original code only sets pm_power_off if it was not already set. Cc: Linus Walleij Cc: Lee Jones Cc: Samuel Ortiz Signed-off-by: Guenter Roeck --- drivers/mfd/ab8500-sysctrl.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c index 8e0dae5..677438f 100644 --- a/drivers/mfd/ab8500-sysctrl.c +++ b/drivers/mfd/ab8500-sysctrl.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -23,7 +24,8 @@ static struct device *sysctrl_dev; -static void ab8500_power_off(void) +static int ab8500_power_off(struct notifier_block *this, unsigned long unused1, + void *unused2) { sigset_t old; sigset_t all; @@ -34,11 +36,6 @@ static void ab8500_power_off(void) struct power_supply *psy; int ret; - if (sysctrl_dev == NULL) { - pr_err("%s: sysctrl not initialized\n", __func__); - return; - } - /* * If we have a charger connected and we're powering off, * reboot into charge-only mode. @@ -83,8 +80,15 @@ shutdown: AB8500_STW4500CTRL1_SWRESET4500N); (void)sigprocmask(SIG_SETMASK, &old, NULL); } + + return NOTIFY_DONE; } +static struct notifier_block ab8500_poweroff_nb = { + .notifier_call = ab8500_power_off, + .priority = 64, +}; + /* * Use the AB WD to reset the platform. It will perform a hard * reset instead of a soft reset. Write the reset reason to @@ -185,6 +189,7 @@ static int ab8500_sysctrl_probe(struct platform_device *pdev) struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent); struct ab8500_platform_data *plat; struct ab8500_sysctrl_platform_data *pdata; + int err; plat = dev_get_platdata(pdev->dev.parent); @@ -193,8 +198,9 @@ static int ab8500_sysctrl_probe(struct platform_device *pdev) sysctrl_dev = &pdev->dev; - if (!pm_power_off) - pm_power_off = ab8500_power_off; + err = register_poweroff_handler(&ab8500_poweroff_nb); + if (err) + dev_err(&pdev->dev, "Failed to register poweroff handler\n"); pdata = plat->sysctrl; if (pdata) { @@ -226,11 +232,9 @@ static int ab8500_sysctrl_probe(struct platform_device *pdev) static int ab8500_sysctrl_remove(struct platform_device *pdev) { + unregister_poweroff_handler(&ab8500_poweroff_nb); sysctrl_dev = NULL; - if (pm_power_off == ab8500_power_off) - pm_power_off = NULL; - return 0; }