linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Guenter Roeck <linux@roeck-us.net>
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 15/16] power/reset: restart-poweroff: Register with kernel poweroff handler
Date: Tue, 30 Sep 2014 18:00:55 +0000	[thread overview]
Message-ID: <1412100056-15517-16-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1412100056-15517-1-git-send-email-linux@roeck-us.net>

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 <sre@kernel.org>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 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 <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/notifier.h>
 #include <linux/platform_device.h>
 #include <linux/of_platform.h>
 #include <linux/module.h>
 #include <linux/reboot.h>
-#include <asm/system_misc.h>
 
-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


  parent reply	other threads:[~2014-09-30 18:00 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-30 18:00 [RFC PATCH 00/16] kernel: Add support for poweroff handler call chain Guenter Roeck
2014-09-30 18:00 ` [RFC PATCH 01/16] " Guenter Roeck
2014-09-30 18:00 ` [RFC PATCH 02/16] hwmon: (ab8500) Call kernel_power_off instead of pm_power_off Guenter Roeck
2014-09-30 18:00 ` [RFC PATCH 03/16] parisc: support poweroff through poweroff handler call chain Guenter Roeck
2014-09-30 18:00 ` [RFC PATCH 04/16] arm: " Guenter Roeck
2014-09-30 18:00 ` [RFC PATCH 05/16] arm64: " Guenter Roeck
2014-10-03 10:30   ` Catalin Marinas
2014-10-03 13:12     ` Guenter Roeck
2014-09-30 18:00 ` [RFC PATCH 06/16] avr32: " Guenter Roeck
2014-09-30 18:00 ` [RFC PATCH 07/16] c6x: " Guenter Roeck
2014-10-03 15:17   ` Mark Salter
2014-09-30 18:00 ` [RFC PATCH 08/16] ia64: " Guenter Roeck
2014-09-30 18:00 ` [RFC PATCH 09/16] metag: " Guenter Roeck
2014-09-30 18:00 ` [RFC PATCH 10/16] mips: " Guenter Roeck
2014-10-01 13:32   ` Ralf Baechle
2014-10-01 16:26     ` Guenter Roeck
2014-09-30 18:00 ` [RFC PATCH 11/16] sh: " Guenter Roeck
2014-09-30 18:00 ` [RFC PATCH 12/16] unicore32: " Guenter Roeck
2014-09-30 18:00 ` [RFC PATCH 13/16] x86: " Guenter Roeck
2014-09-30 18:00 ` [RFC PATCH 14/16] x86/xen: " Guenter Roeck
2014-10-02  9:45   ` [Xen-devel] " David Vrabel
2014-10-02 13:27     ` Guenter Roeck
2014-09-30 18:00 ` Guenter Roeck [this message]
2014-10-03 14:27   ` [RFC PATCH 15/16] power/reset: restart-poweroff: Register with kernel poweroff handler Sebastian Reichel
2014-09-30 18:00 ` [RFC PATCH 16/16] mfd: palmas: " Guenter Roeck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1412100056-15517-16-git-send-email-linux@roeck-us.net \
    --to=linux@roeck-us.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).