From patchwork Tue Oct 7 05:28:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 5041741 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 70BC8C11AB for ; Tue, 7 Oct 2014 05:33:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6EBAF201EC for ; Tue, 7 Oct 2014 05:33:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D09DC2018E for ; Tue, 7 Oct 2014 05:33:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753992AbaJGFc7 (ORCPT ); Tue, 7 Oct 2014 01:32:59 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:41666 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754029AbaJGFbU (ORCPT ); Tue, 7 Oct 2014 01:31:20 -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=C5/zgksP5rmyjYJWibCtfNKrmzKSx1BsuOizBQgzpbw=; b=hnNGFjZ7agVitSe/7ZreKkkewxHIUqmT+LMeC/JO6vDXEFWH1VZgrYRk96zXmbhhWQZBSOeHOjDd1TN/9ao44JDd7lGd3MFgGC/8AJBmUyVgHax0Q4BZO+17h+6F/qjRMjWokak+snv0aQM/KTYv6e4i0XzWHcEp5e5F9t3mpwY=; Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1XbNMl-002ljg-Su for linux-pm@vger.kernel.org; Tue, 07 Oct 2014 05:31:20 +0000 Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:32909 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.82) (envelope-from ) id 1XbNKz-002acn-Vm; Tue, 07 Oct 2014 05:29:30 +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 , Samuel Ortiz , Lee Jones Subject: [PATCH 14/44] mfd: tps80031: Register with kernel poweroff handler Date: Mon, 6 Oct 2014 22:28:16 -0700 Message-Id: <1412659726-29957-15-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.54337AA8.003E, 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: 1155 X-CTCH-SenderID-TotalSpam: 0 X-CTCH-SenderID-TotalSuspected: 98 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-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@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: Samuel Ortiz Cc: Lee Jones Signed-off-by: Guenter Roeck --- drivers/mfd/tps80031.c | 30 ++++++++++++++++++------------ include/linux/mfd/tps80031.h | 2 ++ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/drivers/mfd/tps80031.c b/drivers/mfd/tps80031.c index ed6c5b0..24625a6 100644 --- a/drivers/mfd/tps80031.c +++ b/drivers/mfd/tps80031.c @@ -147,7 +147,6 @@ static const struct tps80031_pupd_data tps80031_pupds[] = { [TPS80031_CTLI2C_SCL] = PUPD_DATA(4, 0, BIT(2)), [TPS80031_CTLI2C_SDA] = PUPD_DATA(4, 0, BIT(3)), }; -static struct tps80031 *tps80031_power_off_dev; int tps80031_ext_power_req_config(struct device *dev, unsigned long ext_ctrl_flag, int preq_bit, @@ -209,11 +208,17 @@ int tps80031_ext_power_req_config(struct device *dev, } EXPORT_SYMBOL_GPL(tps80031_ext_power_req_config); -static void tps80031_power_off(void) +static int tps80031_power_off(struct notifier_block *this, + unsigned long unused1, void *unused2) { - dev_info(tps80031_power_off_dev->dev, "switching off PMU\n"); - tps80031_write(tps80031_power_off_dev->dev, TPS80031_SLAVE_ID1, - TPS80031_PHOENIX_DEV_ON, TPS80031_DEVOFF); + struct tps80031 *tps80031 = container_of(this, struct tps80031, + poweroff_nb); + + dev_info(tps80031->dev, "switching off PMU\n"); + tps80031_write(tps80031->dev, TPS80031_SLAVE_ID1, + TPS80031_PHOENIX_DEV_ON, TPS80031_DEVOFF); + + return NOTIFY_DONE; } static void tps80031_pupd_init(struct tps80031 *tps80031, @@ -501,9 +506,13 @@ static int tps80031_probe(struct i2c_client *client, goto fail_mfd_add; } - if (pdata->use_power_off && !pm_power_off) { - tps80031_power_off_dev = tps80031; - pm_power_off = tps80031_power_off; + if (pdata->use_power_off) { + tps80031->poweroff_nb.notifier_call = tps80031_power_off; + tps80031->poweroff_nb.priority = 64; + ret = register_poweroff_handler(&tps80031->poweroff_nb); + if (ret) + dev_err(&client->dev, + "Failed to register poweroff handler\n"); } return 0; @@ -523,10 +532,7 @@ static int tps80031_remove(struct i2c_client *client) struct tps80031 *tps80031 = i2c_get_clientdata(client); int i; - if (tps80031_power_off_dev == tps80031) { - tps80031_power_off_dev = NULL; - pm_power_off = NULL; - } + unregister_poweroff_handler(&tps80031->poweroff_nb); mfd_remove_devices(tps80031->dev); diff --git a/include/linux/mfd/tps80031.h b/include/linux/mfd/tps80031.h index 2c75c9c..49bc006 100644 --- a/include/linux/mfd/tps80031.h +++ b/include/linux/mfd/tps80031.h @@ -24,6 +24,7 @@ #define __LINUX_MFD_TPS80031_H #include +#include #include /* Pull-ups/Pull-downs */ @@ -513,6 +514,7 @@ struct tps80031 { struct i2c_client *clients[TPS80031_NUM_SLAVES]; struct regmap *regmap[TPS80031_NUM_SLAVES]; struct regmap_irq_chip_data *irq_data; + struct notifier_block poweroff_nb; }; struct tps80031_pupd_init_data {