From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bh-25.webhostbox.net (bh-25.webhostbox.net [208.91.199.152]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 0B8B71A0B18 for ; Tue, 7 Oct 2014 16:30:12 +1100 (EST) Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1XbNLf-002e7x-2R for linuxppc-dev@lists.ozlabs.org; Tue, 07 Oct 2014 05:30:11 +0000 From: Guenter Roeck To: linux-kernel@vger.kernel.org Subject: [PATCH 22/44] power/reset: as3722-poweroff: Register with kernel poweroff handler Date: Mon, 6 Oct 2014 22:28:24 -0700 Message-Id: <1412659726-29957-23-git-send-email-linux@roeck-us.net> In-Reply-To: <1412659726-29957-1-git-send-email-linux@roeck-us.net> References: <1412659726-29957-1-git-send-email-linux@roeck-us.net> Cc: linux-m32r-ja@ml.linux-m32r.org, linux-mips@linux-mips.org, linux-efi@vger.kernel.org, linux-ia64@vger.kernel.org, linux-xtensa@linux-xtensa.org, devel@driverdev.osuosl.org, linux-s390@vger.kernel.org, lguest@lists.ozlabs.org, linux-c6x-dev@linux-c6x.org, Dmitry Eremin-Solenikov , linux-hexagon@vger.kernel.org, linux-sh@vger.kernel.org, linux-acpi@vger.kernel.org, xen-devel@lists.xenproject.org, Guenter Roeck , devicetree@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net, linux-pm@vger.kernel.org, adi-buildroot-devel@lists.sourceforge.net, linux-m68k@lists.linux-m68k.org, linux-am33-list@redhat.com, linux-tegra@vger.kernel.org, openipmi-developer@lists.sourceforge.net, linux-metag@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-parisc@vger.kernel.org, linux-cris-kernel@axis.com, David Woodhouse , Sebastian Reichel , linux-alpha@vger.kernel.org, linuxppc-dev@lists.ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Register with kernel poweroff handler instead of setting pm_power_off directly. Register with a low priority value of 64 to reflect that the original code only sets pm_power_off if it was not already set. Cc: Sebastian Reichel Cc: Dmitry Eremin-Solenikov Cc: David Woodhouse Signed-off-by: Guenter Roeck --- drivers/power/reset/as3722-poweroff.c | 36 ++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/drivers/power/reset/as3722-poweroff.c b/drivers/power/reset/as3722-poweroff.c index 6849711..7ebaed9 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 poweroff_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, poweroff_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,18 +64,19 @@ 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; + as3722_poweroff->poweroff_nb.notifier_call = as3722_power_off; + as3722_poweroff->poweroff_nb.priority = 64; - return 0; + platform_set_drvdata(pdev, as3722_poweroff); + + return register_poweroff_handler(&as3722_poweroff->poweroff_nb); } 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; + struct as3722_poweroff *as3722_poweroff = platform_get_drvdata(pdev); + + unregister_poweroff_handler(&as3722_poweroff->poweroff_nb); return 0; } -- 1.9.1