From mboxrd@z Thu Jan 1 00:00:00 1970 From: Guenter Roeck Subject: [PATCH v3 27/47] power/reset: vexpress-poweroff: Register with kernel power-off handler Date: Mon, 27 Oct 2014 08:55:34 -0700 Message-ID: <1414425354-10359-28-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]:50162 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752997AbaJ0P5G (ORCPT ); Mon, 27 Oct 2014 11:57:06 -0400 Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1XimfK-000cal-2R for linux-pm@vger.kernel.org; Mon, 27 Oct 2014 15:57:06 +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 , David Woodhouse , Dmitry Eremin-Solenikov , Sebastian Reichel Register with kernel power-off handler instead of setting pm_power_off directly. Select default priority to reflect that the original code sets pm_power_off unconditionally. 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 drivers/power/reset/vexpress-poweroff.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/power/reset/vexpress-poweroff.c b/drivers/power/reset/vexpress-poweroff.c index 4dc102e2..b0a39cc 100644 --- a/drivers/power/reset/vexpress-poweroff.c +++ b/drivers/power/reset/vexpress-poweroff.c @@ -12,6 +12,7 @@ */ #include +#include #include #include #include @@ -36,11 +37,19 @@ static void vexpress_reset_do(struct device *dev, const char *what) static struct device *vexpress_power_off_device; -static void vexpress_power_off(void) +static int vexpress_power_off(struct notifier_block *this, + unsigned long unused1, void *unused2) { vexpress_reset_do(vexpress_power_off_device, "power off"); + + return NOTIFY_DONE; } +static struct notifier_block vexpress_power_off_nb = { + .notifier_call = vexpress_power_off, + .priority = POWER_OFF_PRIORITY_DEFAULT, +}; + static struct device *vexpress_restart_device; static void vexpress_restart(enum reboot_mode reboot_mode, const char *cmd) @@ -92,6 +101,7 @@ static int vexpress_reset_probe(struct platform_device *pdev) const struct of_device_id *match = of_match_device(vexpress_reset_of_match, &pdev->dev); struct regmap *regmap; + int ret; if (match) func = (enum vexpress_reset_func)match->data; @@ -106,7 +116,12 @@ static int vexpress_reset_probe(struct platform_device *pdev) switch (func) { case FUNC_SHUTDOWN: vexpress_power_off_device = &pdev->dev; - pm_power_off = vexpress_power_off; + ret = register_power_off_handler(&vexpress_power_off_nb); + if (ret) { + dev_err(&pdev->dev, + "Failed to register power-off handler\n"); + return ret; + } break; case FUNC_RESET: if (!vexpress_restart_device) -- 1.9.1