From mboxrd@z Thu Jan 1 00:00:00 1970 From: Guenter Roeck Subject: [PATCH v3 24/47] power/reset: as3722-poweroff: Register with kernel power-off handler Date: Mon, 27 Oct 2014 08:55:31 -0700 Message-ID: <1414425354-10359-25-git-send-email-linux@roeck-us.net> References: <1414425354-10359-1-git-send-email-linux@roeck-us.net> Return-path: Received: from bh-25.webhostbox.net ([208.91.199.152]:50128 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752835AbaJ0P5A (ORCPT ); Mon, 27 Oct 2014 11:57:00 -0400 Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1XimfD-000cRb-Uo for linux-pm@vger.kernel.org; Mon, 27 Oct 2014 15:57:00 +0000 In-Reply-To: <1414425354-10359-1-git-send-email-linux@roeck-us.net> Sender: linux-pm-owner@vger.kernel.org List-Id: linux-pm@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, Guenter Roeck , Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse Register with kernel power-off 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. Drop remove function since it is no longer needed. Cc: Sebastian Reichel Cc: Dmitry Eremin-Solenikov Cc: David Woodhouse Acked-by: Sebastian Reichel Signed-off-by: Guenter Roeck --- 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: - Use define to specify poweroff handler priority - Use devm_register_power_off_handler - Drop remove function since it is no longer needed drivers/power/reset/as3722-poweroff.c | 39 ++++++++++++++--------------------- 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/drivers/power/reset/as3722-poweroff.c b/drivers/power/reset/as3722-poweroff.c index 6849711..ebc177f 100644 --- a/drivers/power/reset/as3722-poweroff.c +++ b/drivers/power/reset/as3722-poweroff.c @@ -17,32 +17,33 @@ #include #include +#include #include #include #include +#include #include struct as3722_poweroff { struct device *dev; struct as3722 *as3722; + struct notifier_block power_off_nb; }; -static struct as3722_poweroff *as3722_pm_poweroff; - -static void as3722_pm_power_off(void) +static int as3722_power_off(struct notifier_block *this, unsigned long unused1, + void *unused2) { + struct as3722_poweroff *as3722_poweroff = + container_of(this, struct as3722_poweroff, power_off_nb); int ret; - if (!as3722_pm_poweroff) { - pr_err("AS3722 poweroff is not initialised\n"); - return; - } - - ret = as3722_update_bits(as3722_pm_poweroff->as3722, + ret = as3722_update_bits(as3722_poweroff->as3722, AS3722_RESET_CONTROL_REG, AS3722_POWER_OFF, AS3722_POWER_OFF); if (ret < 0) - dev_err(as3722_pm_poweroff->dev, + dev_err(as3722_poweroff->dev, "RESET_CONTROL_REG update failed, %d\n", ret); + + return NOTIFY_DONE; } static int as3722_poweroff_probe(struct platform_device *pdev) @@ -63,20 +64,11 @@ static int as3722_poweroff_probe(struct platform_device *pdev) as3722_poweroff->as3722 = dev_get_drvdata(pdev->dev.parent); as3722_poweroff->dev = &pdev->dev; - as3722_pm_poweroff = as3722_poweroff; - if (!pm_power_off) - pm_power_off = as3722_pm_power_off; - - return 0; -} - -static int as3722_poweroff_remove(struct platform_device *pdev) -{ - if (pm_power_off == as3722_pm_power_off) - pm_power_off = NULL; - as3722_pm_poweroff = NULL; + as3722_poweroff->power_off_nb.notifier_call = as3722_power_off; + as3722_poweroff->power_off_nb.priority = POWER_OFF_PRIORITY_LOW; - return 0; + return devm_register_power_off_handler(&pdev->dev, + &as3722_poweroff->power_off_nb); } static struct platform_driver as3722_poweroff_driver = { @@ -85,7 +77,6 @@ static struct platform_driver as3722_poweroff_driver = { .owner = THIS_MODULE, }, .probe = as3722_poweroff_probe, - .remove = as3722_poweroff_remove, }; module_platform_driver(as3722_poweroff_driver); -- 1.9.1