Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754793AbaJUEXX (ORCPT ); Tue, 21 Oct 2014 00:23:23 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:33684 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754411AbaJUENz (ORCPT ); Tue, 21 Oct 2014 00:13:55 -0400 From: Guenter Roeck To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, Guenter Roeck , Samuel Ortiz , Lee Jones Subject: [PATCH v2 18/47] mfd: twl4030-power: Register with kernel poweroff handler Date: Mon, 20 Oct 2014 21:12:34 -0700 Message-Id: <1413864783-3271-19-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-CTCH-PVer: 0000001 X-CTCH-Spam: Unknown X-CTCH-VOD: Unknown X-CTCH-Flags: 0 X-CTCH-RefID: str=0001.0A02020A.5445DD83.0005,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: 105 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-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Make twl4030_power_off static as it is only called from the twl4030-power driver. Drop remove function as it is no longer needed. Cc: Samuel Ortiz Cc: Lee Jones Signed-off-by: Guenter Roeck --- v2: - Use define to specify poweroff handler priority - Use dev_warn instead of dev_err - Use devm_register_power_off_handler - Drop remove function as it is no longer needed. drivers/mfd/twl4030-power.c | 29 +++++++++++++++++++---------- include/linux/i2c/twl.h | 1 - 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c index cf92a6d..85e4aa4 100644 --- a/drivers/mfd/twl4030-power.c +++ b/drivers/mfd/twl4030-power.c @@ -25,9 +25,10 @@ */ #include -#include +#include #include #include +#include #include #include @@ -611,7 +612,8 @@ twl4030_power_configure_resources(const struct twl4030_power_data *pdata) * After a successful execution, TWL shuts down the power to the SoC * and all peripherals connected to it. */ -void twl4030_power_off(void) +static int twl4030_power_off(struct notifier_block *this, unsigned long unused1, + void *unused2) { int err; @@ -619,8 +621,15 @@ void twl4030_power_off(void) TWL4030_PM_MASTER_P1_SW_EVENTS); if (err) pr_err("TWL4030 Unable to power off\n"); + + return NOTIFY_DONE; } +static struct notifier_block twl4030_poweroff_nb = { + .notifier_call = twl4030_power_off, + .priority = POWEROFF_PRIORITY_LOW, +}; + static bool twl4030_power_use_poweroff(const struct twl4030_power_data *pdata, struct device_node *node) { @@ -839,7 +848,9 @@ static int twl4030_power_probe(struct platform_device *pdev) } /* Board has to be wired properly to use this feature */ - if (twl4030_power_use_poweroff(pdata, node) && !pm_power_off) { + if (twl4030_power_use_poweroff(pdata, node)) { + int ret; + /* Default for SEQ_OFFSYNC is set, lets ensure this */ err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &val, TWL4030_PM_MASTER_CFG_P123_TRANSITION); @@ -856,7 +867,11 @@ static int twl4030_power_probe(struct platform_device *pdev) } } - pm_power_off = twl4030_power_off; + ret = devm_register_power_off_handler(&pdev->dev, + &twl4030_poweroff_nb); + if (ret) + dev_warn(&pdev->dev, + "Failed to register poweroff handler\n"); } relock: @@ -870,11 +885,6 @@ relock: return err; } -static int twl4030_power_remove(struct platform_device *pdev) -{ - return 0; -} - static struct platform_driver twl4030_power_driver = { .driver = { .name = "twl4030_power", @@ -882,7 +892,6 @@ static struct platform_driver twl4030_power_driver = { .of_match_table = of_match_ptr(twl4030_power_of_match), }, .probe = twl4030_power_probe, - .remove = twl4030_power_remove, }; module_platform_driver(twl4030_power_driver); diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index 8cfb50f..f8544f1 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h @@ -680,7 +680,6 @@ struct twl4030_power_data { }; extern int twl4030_remove_script(u8 flags); -extern void twl4030_power_off(void); struct twl4030_codec_data { unsigned int digimic_delay; /* in ms */ -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/