From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 07 Oct 2014 07:38:24 +0200 (CEST) Received: from bh-25.webhostbox.net ([208.91.199.152]:51797 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S27010693AbaJGFbYyYicS (ORCPT ); Tue, 7 Oct 2014 07:31:24 +0200 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=XiGL7rriIxkVjSu1qOtNwEjtQYI4T4k8WgA0o1WT57A=; b=JPyfqQIN1z69VLbamH9ycpPwizr5ez4gXEN0peFlftSIy4geaxJq/Jl7lcEhiJW+bKwC1+yvpStTgMsso+YZGcEBuo4B8GHfzzuDQ4DqZ23AkEbH3uy6cbkXacuZcX01k2sjevpIpSvbMoQqeVpxz/sMNsvOYCQXxeM9DAlSOR4=; Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1XbNMk-002lgb-LW for linux-mips@linux-mips.org; Tue, 07 Oct 2014 05:31:18 +0000 Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:32908 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.82) (envelope-from ) id 1XbNKx-002aYO-OF; Tue, 07 Oct 2014 05:29:28 +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 13/44] mfd: max8907: Register with kernel poweroff handler Date: Mon, 6 Oct 2014 22:28:15 -0700 Message-Id: <1412659726-29957-14-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-CTCH-PVer: 0000001 X-CTCH-Spam: Suspect X-CTCH-VOD: Unknown X-CTCH-Flags: 512 X-CTCH-RefID: str=0001.0A020203.54337AA7.0003,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: 1143 X-CTCH-SenderID-TotalSpam: 0 X-CTCH-SenderID-TotalSuspected: 93 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 - linux-mips.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: Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 43021 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: linux@roeck-us.net Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips 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. Note that this patch fixes a problem on driver unload as side effect: The old code did not restore or clean up pm_power_off on remove, meaning the pointer was left in an undefined state. Cc: Lee Jones Cc: Samuel Ortiz Signed-off-by: Guenter Roeck --- drivers/mfd/max8907.c | 24 ++++++++++++++++++------ include/linux/mfd/max8907.h | 2 ++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/drivers/mfd/max8907.c b/drivers/mfd/max8907.c index 232749c..b8cddc1 100644 --- a/drivers/mfd/max8907.c +++ b/drivers/mfd/max8907.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -177,11 +178,16 @@ static const struct regmap_irq_chip max8907_rtc_irq_chip = { .num_irqs = ARRAY_SIZE(max8907_rtc_irqs), }; -static struct max8907 *max8907_pm_off; -static void max8907_power_off(void) +static int max8907_power_off(struct notifier_block *this, unsigned long unused1, + void *unused2) { - regmap_update_bits(max8907_pm_off->regmap_gen, MAX8907_REG_RESET_CNFG, + struct max8907 *max8907 = container_of(this, struct max8907, + poweroff_nb); + + regmap_update_bits(max8907->regmap_gen, MAX8907_REG_RESET_CNFG, MAX8907_MASK_POWER_OFF, MAX8907_MASK_POWER_OFF); + + return NOTIFY_DONE; } static int max8907_i2c_probe(struct i2c_client *i2c, @@ -267,9 +273,13 @@ static int max8907_i2c_probe(struct i2c_client *i2c, goto err_add_devices; } - if (pm_off && !pm_power_off) { - max8907_pm_off = max8907; - pm_power_off = max8907_power_off; + if (pm_off) { + max8907->poweroff_nb.notifier_call = max8907_power_off; + max8907->poweroff_nb.priority = 64; + ret = register_poweroff_handler(&max8907->poweroff_nb); + if (ret) + dev_err(&i2c->dev, + "Failed to register poweroff handler"); } return 0; @@ -293,6 +303,8 @@ static int max8907_i2c_remove(struct i2c_client *i2c) { struct max8907 *max8907 = i2c_get_clientdata(i2c); + unregister_poweroff_handler(&max8907->poweroff_nb); + mfd_remove_devices(max8907->dev); regmap_del_irq_chip(max8907->i2c_gen->irq, max8907->irqc_rtc); diff --git a/include/linux/mfd/max8907.h b/include/linux/mfd/max8907.h index b06f7a6..016428e 100644 --- a/include/linux/mfd/max8907.h +++ b/include/linux/mfd/max8907.h @@ -13,6 +13,7 @@ #define __LINUX_MFD_MAX8907_H #include +#include #include #define MAX8907_GEN_I2C_ADDR (0x78 >> 1) @@ -247,6 +248,7 @@ struct max8907 { struct regmap_irq_chip_data *irqc_chg; struct regmap_irq_chip_data *irqc_on_off; struct regmap_irq_chip_data *irqc_rtc; + struct notifier_block poweroff_nb; }; #endif -- 1.9.1