From: Guenter Roeck <linux@roeck-us.net>
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 03/16] parisc: support poweroff through poweroff handler call chain
Date: Tue, 30 Sep 2014 18:00:43 +0000 [thread overview]
Message-ID: <1412100056-15517-4-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1412100056-15517-1-git-send-email-linux@roeck-us.net>
The kernel core now supports a poweroff handler call chain
to remove power from the system. Call it from machine_power_off.
Also, do not use pm_power_off as alternate pointer to machine_power_off.
Have the parisc/power driver call kernel_power_off() which in turn will
call machine_power_off().
Cc: James E.J. Bottomley <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
arch/parisc/kernel/process.c | 7 +++++--
drivers/parisc/power.c | 3 +--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index 0bbbf0d..21d1ab3 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -42,6 +42,7 @@
#include <linux/module.h>
#include <linux/personality.h>
#include <linux/ptrace.h>
+#include <linux/reboot.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/stddef.h>
@@ -133,7 +134,9 @@ void machine_power_off(void)
pdc_soft_power_button(0);
pdc_chassis_send_status(PDC_CHASSIS_DIRECT_SHUTDOWN);
-
+
+ do_kernel_poweroff();
+
/* It seems we have no way to power the system off via
* software. The user has to press the button himself. */
@@ -141,7 +144,7 @@ void machine_power_off(void)
"Please power this system off now.");
}
-void (*pm_power_off)(void) = machine_power_off;
+void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
/*
diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c
index 90cca5e..de5b2ff 100644
--- a/drivers/parisc/power.c
+++ b/drivers/parisc/power.c
@@ -95,8 +95,7 @@ static void process_shutdown(void)
/* send kill signal */
if (kill_cad_pid(SIGINT, 1)) {
/* just in case killing init process failed */
- if (pm_power_off)
- pm_power_off();
+ kernel_power_off();
}
}
}
--
1.9.1
next prev 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 ` Guenter Roeck [this message]
2014-09-30 18:00 ` [RFC PATCH 04/16] arm: support poweroff through poweroff handler call chain 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 ` [RFC PATCH 15/16] power/reset: restart-poweroff: Register with kernel poweroff handler Guenter Roeck
2014-10-03 14:27 ` 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-4-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).