From patchwork Tue Oct 7 05:28:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 5042231 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 C503E9F295 for ; Tue, 7 Oct 2014 05:34:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E802C20131 for ; Tue, 7 Oct 2014 05:34:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC86D2010C for ; Tue, 7 Oct 2014 05:34:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754039AbaJGFcn (ORCPT ); Tue, 7 Oct 2014 01:32:43 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:41479 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754060AbaJGFbF (ORCPT ); Tue, 7 Oct 2014 01:31:05 -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=dEpznAkDNuwarjUTxY3qBjZxB4aEtytQWY3/s2Nrp8Y=; b=5PolFc5ltvszFWFWxinMYtDUjUM36l/ME1ZhOYPBTZ1W+XjG8XyrsNCu0RiNyMTyNquR+Q1KeMrm2IMzoswOjk2iPReHARZ4Oz36RWBWPzbTUWl5WYEexqzdzRG2S1ROh3TqhBCMQxPOyAHb2H8pWqqqLwHu7+4Na51hQXTj0sY=; Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1XbNMW-002k56-Qd for linux-sh@vger.kernel.org; Tue, 07 Oct 2014 05:31:04 +0000 Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:32905 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.82) (envelope-from ) id 1XbNKr-002aPm-12; Tue, 07 Oct 2014 05:29:21 +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 , Lee Jones , Samuel Ortiz Subject: [PATCH 10/44] mfd: axp20x: Register with kernel poweroff handler Date: Mon, 6 Oct 2014 22:28:12 -0700 Message-Id: <1412659726-29957-11-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.0A020207.54337A99.0029, 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: 1006 X-CTCH-SenderID-TotalSpam: 0 X-CTCH-SenderID-TotalSuspected: 30 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: Lee Jones Cc: Samuel Ortiz Signed-off-by: Guenter Roeck --- drivers/mfd/axp20x.c | 30 +++++++++++++++++------------- include/linux/mfd/axp20x.h | 1 + 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c index dee6539..238db4c 100644 --- a/drivers/mfd/axp20x.c +++ b/drivers/mfd/axp20x.c @@ -17,7 +17,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -161,11 +162,16 @@ static struct mfd_cell axp20x_cells[] = { }, }; -static struct axp20x_dev *axp20x_pm_power_off; -static void axp20x_power_off(void) +static int axp20x_power_off(struct notifier_block *this, unsigned long unused1, + void *unused2) + { - regmap_write(axp20x_pm_power_off->regmap, AXP20X_OFF_CTRL, - AXP20X_OFF); + struct axp20x_dev *axp20x = container_of(this, struct axp20x_dev, + poweroff_nb); + + regmap_write(axp20x->regmap, AXP20X_OFF_CTRL, AXP20X_OFF); + + return NOTIFY_DONE; } static int axp20x_i2c_probe(struct i2c_client *i2c, @@ -215,10 +221,11 @@ static int axp20x_i2c_probe(struct i2c_client *i2c, return ret; } - if (!pm_power_off) { - axp20x_pm_power_off = axp20x; - pm_power_off = axp20x_power_off; - } + axp20x->poweroff_nb.notifier_call = axp20x_power_off; + axp20x->poweroff_nb.priority = 64; + ret = register_poweroff_handler(&axp20x->poweroff_nb); + if (ret) + dev_err(&i2c->dev, "failed to register poweroff handler\n"); dev_info(&i2c->dev, "AXP20X driver loaded\n"); @@ -229,10 +236,7 @@ static int axp20x_i2c_remove(struct i2c_client *i2c) { struct axp20x_dev *axp20x = i2c_get_clientdata(i2c); - if (axp20x == axp20x_pm_power_off) { - axp20x_pm_power_off = NULL; - pm_power_off = NULL; - } + unregister_poweroff_handler(&axp20x->poweroff_nb); mfd_remove_devices(axp20x->dev); regmap_del_irq_chip(axp20x->i2c_client->irq, axp20x->regmap_irqc); diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h index d0e31a2..8f23b39 100644 --- a/include/linux/mfd/axp20x.h +++ b/include/linux/mfd/axp20x.h @@ -175,6 +175,7 @@ struct axp20x_dev { struct regmap *regmap; struct regmap_irq_chip_data *regmap_irqc; long variant; + struct notifier_block poweroff_nb; }; #endif /* __LINUX_MFD_AXP20X_H */