From patchwork Tue Oct 7 05:28:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 5041151 Return-Path: X-Original-To: patchwork-linux-parisc@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 84360C11AB for ; Tue, 7 Oct 2014 05:32:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9025B20148 for ; Tue, 7 Oct 2014 05:32:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AD5282010C for ; Tue, 7 Oct 2014 05:32:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754096AbaJGFb6 (ORCPT ); Tue, 7 Oct 2014 01:31:58 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:41704 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751244AbaJGFbZ (ORCPT ); Tue, 7 Oct 2014 01:31:25 -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=pf3Wqv8RXr+QDjTYgi/Q0BsjSDErAoFO624WxNptY/U=; b=bZtl9hC2ADfkNTIdoxpjEHa8y5VM2lyWS4gILaayRBZbQBkgKxTHDFjdPcCqlyyVkpRzPsAjWpXO740Ixqu8uUJApbPf/9L8w7WV0Z/txidC3QaNrSySfQnr9aADeaAfjFkU0hReaOb/CC20/6V37TpTonLhzcHaiLveZgpEIoc=; Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1XbNMq-002m9Z-Ft for linux-parisc@vger.kernel.org; Tue, 07 Oct 2014 05:31:24 +0000 Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:32906 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.82) (envelope-from ) id 1XbNKt-002aTM-6u; Tue, 07 Oct 2014 05:29:23 +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 11/44] mfd: retu: Register with kernel poweroff handler Date: Mon, 6 Oct 2014 22:28:13 -0700 Message-Id: <1412659726-29957-12-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=ham 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.0A020208.54337AAC.00F7, 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: 1181 X-CTCH-SenderID-TotalSpam: 0 X-CTCH-SenderID-TotalSuspected: 112 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-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@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/retu-mfd.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/drivers/mfd/retu-mfd.c b/drivers/mfd/retu-mfd.c index 663f8a3..64b60fa 100644 --- a/drivers/mfd/retu-mfd.c +++ b/drivers/mfd/retu-mfd.c @@ -22,6 +22,8 @@ #include #include #include +#include +#include #include #include #include @@ -43,6 +45,7 @@ struct retu_dev { struct device *dev; struct mutex mutex; struct regmap_irq_chip_data *irq_data; + struct notifier_block poweroff_nb; }; static struct resource retu_pwrbutton_res[] = { @@ -81,9 +84,6 @@ static struct regmap_irq_chip retu_irq_chip = { .ack_base = RETU_REG_IDR, }; -/* Retu device registered for the power off. */ -static struct retu_dev *retu_pm_power_off; - static struct resource tahvo_usb_res[] = { { .name = "tahvo-usb", @@ -165,12 +165,14 @@ int retu_write(struct retu_dev *rdev, u8 reg, u16 data) } EXPORT_SYMBOL_GPL(retu_write); -static void retu_power_off(void) +static int retu_power_off(struct notifier_block *this, unsigned long unused1, + void *unused2) { - struct retu_dev *rdev = retu_pm_power_off; + struct retu_dev *rdev = container_of(this, struct retu_dev, + poweroff_nb); int reg; - mutex_lock(&retu_pm_power_off->mutex); + mutex_lock(&rdev->mutex); /* Ignore power button state */ regmap_read(rdev->regmap, RETU_REG_CC1, ®); @@ -183,7 +185,9 @@ static void retu_power_off(void) for (;;) cpu_relax(); - mutex_unlock(&retu_pm_power_off->mutex); + mutex_unlock(&rdev->mutex); + + return NOTIFY_DONE; } static int retu_regmap_read(void *context, const void *reg, size_t reg_size, @@ -279,9 +283,13 @@ static int retu_probe(struct i2c_client *i2c, const struct i2c_device_id *id) return ret; } - if (i2c->addr == 1 && !pm_power_off) { - retu_pm_power_off = rdev; - pm_power_off = retu_power_off; + if (i2c->addr == 1) { + rdev->poweroff_nb.notifier_call = retu_power_off; + rdev->poweroff_nb.priority = 64; + ret = register_poweroff_handler(&rdev->poweroff_nb); + if (ret) + dev_err(rdev->dev, + "Failed to register poweroff handler\n"); } return 0; @@ -291,10 +299,7 @@ static int retu_remove(struct i2c_client *i2c) { struct retu_dev *rdev = i2c_get_clientdata(i2c); - if (retu_pm_power_off == rdev) { - pm_power_off = NULL; - retu_pm_power_off = NULL; - } + unregister_poweroff_handler(&rdev->poweroff_nb); mfd_remove_devices(rdev->dev); regmap_del_irq_chip(i2c->irq, rdev->irq_data);