From patchwork Mon Nov 10 01:42:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 5263221 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 BEAAD9F295 for ; Mon, 10 Nov 2014 01:50:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EECA020115 for ; Mon, 10 Nov 2014 01:50:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D5292010C for ; Mon, 10 Nov 2014 01:50:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752484AbaKJBoc (ORCPT ); Sun, 9 Nov 2014 20:44:32 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:39104 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752463AbaKJBo3 (ORCPT ); Sun, 9 Nov 2014 20:44:29 -0500 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=IBfEN4yXXea+rd85XkkSHK7IXOyqJh6a2SMI+BYb2k8=; b=R6vfehXrb6Uzv3ElHn4za0HEoANQDxCWaAU4U/VwG1N2DzptQ2GQqhJYByW6CTimuk5HfgWcRHv8Qck79ZtLSN8raSbG6hHSfTRP+Oa0b3Z3su3VJD5DXCZwk1beDXk6l5kbFTh6nPZC5bWB9f9MvPiAC4dhbGSP7nwzVQWAJMc=; Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1Xne1t-000VWr-J8 for linux-pm@vger.kernel.org; Mon, 10 Nov 2014 01:44:29 +0000 Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:36318 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.82) (envelope-from ) id 1Xne1s-000VW9-Aq; Mon, 10 Nov 2014 01:44:28 +0000 From: Guenter Roeck To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, Guenter Roeck , David Woodhouse , Dmitry Eremin-Solenikov , Sebastian Reichel Subject: [PATCH v6 29/48] power/reset: ltc2952-poweroff: Register with kernel power-off handler Date: Sun, 9 Nov 2014 17:42:46 -0800 Message-Id: <1415583785-6980-30-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415583785-6980-1-git-send-email-linux@roeck-us.net> References: <1415583785-6980-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=-7.4 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.0A020202.5460187D.0108, ss=1, re=0.001, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-Score: 0.001 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: 170 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 power-off handler instead of setting pm_power_off directly. Register with low priority to reflect that the original code sets pm_power_off only if it was not already set. Acked-by: Sebastian Reichel Signed-off-by: Guenter Roeck --- v6: - This patch: No change. Global: Replaced priority defines with enum. v5: - Rebase to v3.18-rc3 v4: - Do not use notifiers but internal functions and data structures to manage the list of power-off handlers. Drop unused parameters from callbacks, and make the power-off function type void v3: - Replace poweroff in all newly introduced variables and in text with power_off or power-off as appropriate - Replace POWEROFF_PRIORITY_xxx with POWER_OFF_PRIORITY_xxx v2: - Added patch drivers/power/reset/ltc2952-poweroff.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/power/reset/ltc2952-poweroff.c b/drivers/power/reset/ltc2952-poweroff.c index 116a1ce..e622824 100644 --- a/drivers/power/reset/ltc2952-poweroff.c +++ b/drivers/power/reset/ltc2952-poweroff.c @@ -80,6 +80,8 @@ struct ltc2952_poweroff_data { * 2: kill */ struct gpio_desc *gpio[3]; + + struct power_off_handler_block power_off_hb; }; static int ltc2952_poweroff_panic; @@ -180,7 +182,8 @@ irq_ok: return IRQ_HANDLED; } -static void ltc2952_poweroff_kill(void) +static void ltc2952_poweroff_kill(struct power_off_handler_block *this) + { gpiod_set_value(ltc2952_data->gpio[POWERPATH_IO_KILL], 1); } @@ -285,12 +288,7 @@ err_io: static int ltc2952_poweroff_probe(struct platform_device *pdev) { - int ret; - - if (pm_power_off) { - dev_err(&pdev->dev, "pm_power_off already registered"); - return -EBUSY; - } + int i, ret; ltc2952_data = kzalloc(sizeof(*ltc2952_data), GFP_KERNEL); if (!ltc2952_data) @@ -302,12 +300,20 @@ static int ltc2952_poweroff_probe(struct platform_device *pdev) if (ret) goto err; - pm_power_off = <c2952_poweroff_kill; + ltc2952_data->power_off_hb.handler = ltc2952_poweroff_kill; + ltc2952_data->power_off_hb.priority = POWER_OFF_PRIORITY_LOW; + ret = register_power_off_handler(<c2952_data->power_off_hb); + if (ret) + goto err_power; dev_info(&pdev->dev, "probe successful\n"); return 0; +err_power: + free_irq(ltc2952_data->virq, ltc2952_data); + for (i = 0; i < ARRAY_SIZE(ltc2952_data->gpio); i++) + gpiod_put(ltc2952_data->gpio[i]); err: kfree(ltc2952_data); return ret; @@ -317,7 +323,7 @@ static int ltc2952_poweroff_remove(struct platform_device *pdev) { unsigned int i; - pm_power_off = NULL; + unregister_power_off_handler(<c2952_data->power_off_hb); if (ltc2952_data) { free_irq(ltc2952_data->virq, ltc2952_data);