From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753228AbaI3SCj (ORCPT ); Tue, 30 Sep 2014 14:02:39 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:45904 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753803AbaI3SBq (ORCPT ); Tue, 30 Sep 2014 14:01:46 -0400 From: Guenter Roeck To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-ia64@vger.kernel.org, linux-metag@vger.kernel.org, linux-mips@linux-mips.org, linux-parisc@vger.kernel.org, linux-sh@vger.kernel.org, xen-devel@lists.xenproject.org, Guenter Roeck , Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse Subject: [RFC PATCH 15/16] power/reset: restart-poweroff: Register with kernel poweroff handler Date: Tue, 30 Sep 2014 11:00:55 -0700 Message-Id: <1412100056-15517-16-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1412100056-15517-1-git-send-email-linux@roeck-us.net> References: <1412100056-15517-1-git-send-email-linux@roeck-us.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Register with kernel poweroff handler instead of seting pm_power_off directly. Register as poweroff handler of last resort since the driver does not really power off the system but executes a restart. Cc: Sebastian Reichel Cc: Dmitry Eremin-Solenikov Cc: David Woodhouse Signed-off-by: Guenter Roeck --- drivers/power/reset/restart-poweroff.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/power/reset/restart-poweroff.c b/drivers/power/reset/restart-poweroff.c index edd707e..82d058f 100644 --- a/drivers/power/reset/restart-poweroff.c +++ b/drivers/power/reset/restart-poweroff.c @@ -12,35 +12,33 @@ */ #include #include +#include #include #include #include #include -#include -static void restart_poweroff_do_poweroff(void) +static int restart_poweroff_do_poweroff(struct notifier_block *this, + unsigned long unused1, void *unused2) { reboot_mode = REBOOT_HARD; machine_restart(NULL); + + return NOTIFY_DONE; } +static struct notifier_block restart_poweroff_handler = { + .notifier_call = restart_poweroff_do_poweroff, +}; + static int restart_poweroff_probe(struct platform_device *pdev) { - /* If a pm_power_off function has already been added, leave it alone */ - if (pm_power_off != NULL) { - dev_err(&pdev->dev, - "pm_power_off function already registered"); - return -EBUSY; - } - - pm_power_off = &restart_poweroff_do_poweroff; - return 0; + return register_restart_handler(&restart_poweroff_handler); } static int restart_poweroff_remove(struct platform_device *pdev) { - if (pm_power_off == &restart_poweroff_do_poweroff) - pm_power_off = NULL; + unregister_restart_handler(&restart_poweroff_handler); return 0; } -- 1.9.1