From patchwork Tue Oct 21 04:12:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 5109761 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 3568B9F30B for ; Tue, 21 Oct 2014 04:19:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5A649201B4 for ; Tue, 21 Oct 2014 04:19:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2FE3420148 for ; Tue, 21 Oct 2014 04:19:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754458AbaJUEOc (ORCPT ); Tue, 21 Oct 2014 00:14:32 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:33881 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754562AbaJUEOa (ORCPT ); Tue, 21 Oct 2014 00:14:30 -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=GlHhII+mG2hslPaknxOfIrrJsVQJxHnX96qD1nlcxGw=; b=8LrrBZcoTjkwPymxmgUdglmHNiNy6dpKgIlmwZ0F4jJ4KVTYvu8C+JhJjyUH2B0WE0pZX03LtLkoHQnx5msd0oY4V7E0YjE2FhjZMe5cM8RS5CEPenecSEgv4/gU/Uy/ZVRJ3W1/MlqFr6+xZgLSaBttpZoSBh8dSDuRU2e11UQ=; Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1XgQq5-002eKH-PQ for linux-pm@vger.kernel.org; Tue, 21 Oct 2014 04:14:29 +0000 Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:40572 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.82) (envelope-from ) id 1XgQq3-002eHc-S1; Tue, 21 Oct 2014 04:14:28 +0000 From: Guenter Roeck To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, Guenter Roeck , Julian Andres Klode , Marc Dietrich , Greg Kroah-Hartman , ac100@lists.launchpad.net, devel@driverdev.osuosl.org, linux-tegra@vger.kernel.org Subject: [PATCH v2 33/47] staging: nvec: Register with kernel poweroff handler Date: Mon, 20 Oct 2014 21:12:49 -0700 Message-Id: <1413864783-3271-34-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.0A020209.5445DDA5.0157, 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: 175 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 default priority since we don't know any better. Cc: Julian Andres Klode Cc: Marc Dietrich Cc: Greg Kroah-Hartman Acked-by: Greg Kroah-Hartman Signed-off-by: Guenter Roeck --- v2: - Use define to specify poweroff handler priority - Use dev_warn instead of dev_err drivers/staging/nvec/nvec.c | 24 +++++++++++++++--------- drivers/staging/nvec/nvec.h | 2 ++ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c index a93208a..78b68a3 100644 --- a/drivers/staging/nvec/nvec.c +++ b/drivers/staging/nvec/nvec.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -80,8 +81,6 @@ enum nvec_sleep_subcmds { #define LID_SWITCH BIT(1) #define PWR_BUTTON BIT(15) -static struct nvec_chip *nvec_power_handle; - static const struct mfd_cell nvec_devices[] = { { .name = "nvec-kbd", @@ -759,12 +758,17 @@ static void nvec_disable_i2c_slave(struct nvec_chip *nvec) } #endif -static void nvec_power_off(void) +static int nvec_power_off(struct notifier_block *this, unsigned long unused1, + void *unused2) { + struct nvec_chip *nvec = container_of(this, struct nvec_chip, + poweroff_nb); char ap_pwr_down[] = { NVEC_SLEEP, AP_PWR_DOWN }; - nvec_toggle_global_events(nvec_power_handle, false); - nvec_write_async(nvec_power_handle, ap_pwr_down, 2); + nvec_toggle_global_events(nvec, false); + nvec_write_async(nvec, ap_pwr_down, 2); + + return NOTIFY_DONE; } /* @@ -878,8 +882,11 @@ static int tegra_nvec_probe(struct platform_device *pdev) nvec->nvec_status_notifier.notifier_call = nvec_status_notifier; nvec_register_notifier(nvec, &nvec->nvec_status_notifier, 0); - nvec_power_handle = nvec; - pm_power_off = nvec_power_off; + nvec->poweroff_nb.notifier_call = nvec_power_off; + nvec->poweroff_nb.priority = POWEROFF_PRIORITY_DEFAULT; + ret = register_power_off_handler(&nvec->poweroff_nb); + if (ret) + dev_warn(nvec->dev, "Failed to register poweroff handler\n"); /* Get Firmware Version */ msg = nvec_write_sync(nvec, get_firmware_version, 2); @@ -914,13 +921,12 @@ static int tegra_nvec_remove(struct platform_device *pdev) { struct nvec_chip *nvec = platform_get_drvdata(pdev); + unregister_power_off_handler(&nvec->poweroff_nb); nvec_toggle_global_events(nvec, false); mfd_remove_devices(nvec->dev); nvec_unregister_notifier(nvec, &nvec->nvec_status_notifier); cancel_work_sync(&nvec->rx_work); cancel_work_sync(&nvec->tx_work); - /* FIXME: needs check wether nvec is responsible for power off */ - pm_power_off = NULL; return 0; } diff --git a/drivers/staging/nvec/nvec.h b/drivers/staging/nvec/nvec.h index e271375..e5ee2af 100644 --- a/drivers/staging/nvec/nvec.h +++ b/drivers/staging/nvec/nvec.h @@ -163,6 +163,8 @@ struct nvec_chip { struct nvec_msg *last_sync_msg; int state; + + struct notifier_block poweroff_nb; }; extern int nvec_write_async(struct nvec_chip *nvec, const unsigned char *data,