From patchwork Tue Oct 21 04:12:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 5109271 Return-Path: X-Original-To: patchwork-linux-pm@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 D70919F30B for ; Tue, 21 Oct 2014 04:14:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F20C120136 for ; Tue, 21 Oct 2014 04:14:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0B4CE20176 for ; Tue, 21 Oct 2014 04:14:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754455AbaJUEOC (ORCPT ); Tue, 21 Oct 2014 00:14:02 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:33706 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754429AbaJUEOA (ORCPT ); Tue, 21 Oct 2014 00:14:00 -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=5vRpxWxXssF1W+CIe3zkCwUIChtKFk/Pi9feCqZ5gc4=; b=b5ueUpaLnDrYj/pTChH5zfwIpRR4vyp3WHHLjMEPRJ49M2+/3s46XsncrQP1rrJk0UTuVfcfuRUBuFEUGDmVzKPsbDo4mXyfyBVe7jgA923BYVdIpZ9tNcCmVkClKzRy3nivv0LC1vGWz2vbQPdHiLHa5IIfJqZHtVfnaXfQ158=; Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1XgQpc-002dc6-8t for linux-pm@vger.kernel.org; Tue, 21 Oct 2014 04:14:00 +0000 Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:40558 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.82) (envelope-from ) id 1XgQpa-002db2-UL; Tue, 21 Oct 2014 04:13:59 +0000 From: Guenter Roeck To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, Guenter Roeck , Beniamino Galvani , Lee Jones , Samuel Ortiz Subject: [PATCH v2 20/47] mfd: rn5t618: Register poweroff handler with kernel poweroff handler Date: Mon, 20 Oct 2014 21:12:36 -0700 Message-Id: <1413864783-3271-21-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1413864783-3271-1-git-send-email-linux@roeck-us.net> References: <1413864783-3271-1-git-send-email-linux@roeck-us.net> X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-CTCH-PVer: 0000001 X-CTCH-Spam: Unknown X-CTCH-VOD: Unknown X-CTCH-Flags: 0 X-CTCH-RefID: str=0001.0A02020A.5445DD88.0081, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-Score: 0.000 X-CTCH-ScoreCust: 0.000 X-CTCH-Rules: C_4847, X-CTCH-SenderID: linux@roeck-us.net X-CTCH-SenderID-Flags: 0 X-CTCH-SenderID-TotalMessages: 117 X-CTCH-SenderID-TotalSpam: 0 X-CTCH-SenderID-TotalSuspected: 0 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 low priority to reflect that the original code only sets pm_power_off if it was not already set. Cc: Beniamino Galvani Signed-off-by: Guenter Roeck --- v2: New patch drivers/mfd/rn5t618.c | 32 ++++++++++++++++---------------- include/linux/mfd/rn5t618.h | 2 ++ 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/drivers/mfd/rn5t618.c b/drivers/mfd/rn5t618.c index 6668571..045cd43 100644 --- a/drivers/mfd/rn5t618.c +++ b/drivers/mfd/rn5t618.c @@ -15,6 +15,8 @@ #include #include #include +#include +#include #include static const struct mfd_cell rn5t618_cells[] = { @@ -47,16 +49,20 @@ static const struct regmap_config rn5t618_regmap_config = { .cache_type = REGCACHE_RBTREE, }; -static struct rn5t618 *rn5t618_pm_power_off; - -static void rn5t618_power_off(void) +static int rn5t618_power_off(struct notifier_block *this, + unsigned long unused1, void *unused2) { + struct rn5t618 *rn5t618 = container_of(this, struct rn5t618, + poweroff_nb); + /* disable automatic repower-on */ - regmap_update_bits(rn5t618_pm_power_off->regmap, RN5T618_REPCNT, + regmap_update_bits(rn5t618->regmap, RN5T618_REPCNT, RN5T618_REPCNT_REPWRON, 0); /* start power-off sequence */ - regmap_update_bits(rn5t618_pm_power_off->regmap, RN5T618_SLPCNT, + regmap_update_bits(rn5t618->regmap, RN5T618_SLPCNT, RN5T618_SLPCNT_SWPWROFF, RN5T618_SLPCNT_SWPWROFF); + + return NOTIFY_DONE; } static int rn5t618_i2c_probe(struct i2c_client *i2c, @@ -85,23 +91,17 @@ static int rn5t618_i2c_probe(struct i2c_client *i2c, return ret; } - if (!pm_power_off) { - rn5t618_pm_power_off = priv; - pm_power_off = rn5t618_power_off; - } + priv->poweroff_nb.notifier_call = rn5t618_power_off; + priv->poweroff_nb.priority = POWEROFF_PRIORITY_LOW; + ret = devm_register_power_off_handler(&i2c->dev, &priv->poweroff_nb); + if (ret) + dev_warn(&i2c->dev, "Failed to register poweroff handler\n"); return 0; } static int rn5t618_i2c_remove(struct i2c_client *i2c) { - struct rn5t618 *priv = i2c_get_clientdata(i2c); - - if (priv == rn5t618_pm_power_off) { - rn5t618_pm_power_off = NULL; - pm_power_off = NULL; - } - mfd_remove_devices(&i2c->dev); return 0; } diff --git a/include/linux/mfd/rn5t618.h b/include/linux/mfd/rn5t618.h index c72d534..3b0f0e6 100644 --- a/include/linux/mfd/rn5t618.h +++ b/include/linux/mfd/rn5t618.h @@ -14,6 +14,7 @@ #ifndef __LINUX_MFD_RN5T618_H #define __LINUX_MFD_RN5T618_H +#include #include #define RN5T618_LSIVER 0x00 @@ -223,6 +224,7 @@ enum { struct rn5t618 { struct regmap *regmap; + struct notifier_block poweroff_nb; }; #endif /* __LINUX_MFD_RN5T618_H */