From: Guenter Roeck <linux@roeck-us.net>
To: linux-kernel@vger.kernel.org
Cc: linux-pm@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>,
David Woodhouse <dwmw2@infradead.org>,
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
Sebastian Reichel <sre@kernel.org>
Subject: [PATCH v5 28/48] power/reset: at91-poweroff: Register with kernel power-off handler
Date: Thu, 6 Nov 2014 08:43:12 -0800 [thread overview]
Message-ID: <1415292213-28652-29-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1415292213-28652-1-git-send-email-linux@roeck-us.net>
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 <sre@kernel.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
v5:
- Rebase to v3.18-rc3
v4:
- Do not use notifiers but internal functions and data structures to manage
the list of power-off handlers. Drop unused parameters from callbacks, and
make the power-off function type void
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:
- Added patch
drivers/power/reset/at91-poweroff.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/power/reset/at91-poweroff.c b/drivers/power/reset/at91-poweroff.c
index c610003..6fc5944 100644
--- a/drivers/power/reset/at91-poweroff.c
+++ b/drivers/power/reset/at91-poweroff.c
@@ -14,6 +14,7 @@
#include <linux/module.h>
#include <linux/of.h>
#include <linux/platform_device.h>
+#include <linux/pm.h>
#include <linux/printk.h>
#define AT91_SHDW_CR 0x00 /* Shut Down Control Register */
@@ -66,11 +67,16 @@ static void __init at91_wakeup_status(void)
pr_info("AT91: Wake-Up source: %s\n", reason);
}
-static void at91_poweroff(void)
+static void at91_poweroff(struct power_off_handler_block *this)
{
writel(AT91_SHDW_KEY | AT91_SHDW_SHDW, at91_shdwc_base + AT91_SHDW_CR);
}
+static struct power_off_handler_block at91_power_off_hb = {
+ .handler = at91_poweroff,
+ .priority = POWER_OFF_PRIORITY_DEFAULT,
+};
+
const enum wakeup_type at91_poweroff_get_wakeup_mode(struct device_node *np)
{
const char *pm;
@@ -134,9 +140,7 @@ static int at91_poweroff_probe(struct platform_device *pdev)
if (pdev->dev.of_node)
at91_poweroff_dt_set_wakeup_mode(pdev);
- pm_power_off = at91_poweroff;
-
- return 0;
+ return devm_register_power_off_handler(&pdev->dev, &at91_power_off_hb);
}
static struct of_device_id at91_poweroff_of_match[] = {
--
1.9.1
next prev parent reply other threads:[~2014-11-06 16:44 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-06 16:42 [PATCH v5 00/48] kernel: Add support for power-off handler call chain Guenter Roeck
2014-11-06 16:42 ` [PATCH v5 01/48] " Guenter Roeck
2014-11-06 22:30 ` Rafael J. Wysocki
2014-11-06 22:27 ` Guenter Roeck
2014-11-07 0:16 ` Rafael J. Wysocki
2014-11-07 3:00 ` Guenter Roeck
2014-11-06 16:42 ` [PATCH v5 02/48] memory: emif: Use API function to determine power-off capability Guenter Roeck
2014-11-06 16:42 ` [PATCH v5 03/48] hibernate: Call have_kernel_power_off instead of checking pm_power_off Guenter Roeck
2014-11-06 16:42 ` [PATCH v5 04/48] m68k: Replace mach_power_off with pm_power_off Guenter Roeck
2014-11-06 16:42 ` [PATCH v5 05/48] mfd: as3722: Drop reference to pm_power_off from devicetree bindings Guenter Roeck
[not found] ` <1415292213-28652-1-git-send-email-linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
2014-11-06 16:42 ` [PATCH v5 06/48] gpio-poweroff: " Guenter Roeck
2014-11-06 16:42 ` [PATCH v5 07/48] qnap-poweroff: " Guenter Roeck
2014-11-06 16:42 ` [PATCH v5 08/48] kernel: Move pm_power_off to common code Guenter Roeck
2014-11-06 16:42 ` [PATCH v5 09/48] mfd: palmas: Register with kernel power-off handler Guenter Roeck
2014-11-06 16:42 ` [PATCH v5 10/48] mfd: axp20x: " Guenter Roeck
2014-11-06 16:42 ` [PATCH v5 11/48] mfd: retu: " Guenter Roeck
2014-11-06 16:42 ` [PATCH v5 12/48] mfd: ab8500-sysctrl: " Guenter Roeck
2014-11-06 16:42 ` [PATCH v5 13/48] mfd: max8907: " Guenter Roeck
2014-11-06 16:42 ` [PATCH v5 14/48] mfd: tps80031: " Guenter Roeck
2014-11-06 16:42 ` [PATCH v5 15/48] mfd: dm355evm_msp: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 16/48] mfd: tps6586x: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 17/48] mfd: tps65910: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 18/48] mfd: twl4030-power: " Guenter Roeck
2014-11-10 8:46 ` Pavel Machek
2014-11-10 14:09 ` Guenter Roeck
2014-11-10 14:49 ` Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 19/48] mfd: rk808: Register power-off handler " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 20/48] mfd: rn5t618: " Guenter Roeck
2014-11-07 21:00 ` Beniamino Galvani
2014-11-08 4:19 ` Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 21/48] ipmi: Register " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 22/48] power/reset: restart-poweroff: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 23/48] power/reset: gpio-poweroff: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 24/48] power/reset: as3722-poweroff: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 25/48] power/reset: qnap-poweroff: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 26/48] power/reset: msm-poweroff: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 27/48] power/reset: vexpress-poweroff: " Guenter Roeck
2014-11-06 16:43 ` Guenter Roeck [this message]
2014-11-06 16:43 ` [PATCH v5 29/48] power/reset: ltc2952-poweroff: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 30/48] x86: iris: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 31/48] x86: apm: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 32/48] x86: olpc: Register xo1 power-off handler " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 33/48] staging: nvec: Register " Guenter Roeck
[not found] ` <1415292213-28652-34-git-send-email-linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
2014-11-09 21:41 ` Marc Dietrich
2014-11-09 23:06 ` Andreas Färber
2014-11-09 23:54 ` Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 34/48] acpi: Register power-off handler " Guenter Roeck
2014-11-06 22:32 ` Rafael J. Wysocki
2014-11-07 19:47 ` Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 35/48] arm: Register " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 36/48] arm64: psci: " Guenter Roeck
2014-11-06 17:22 ` Mark Rutland
2014-11-06 18:51 ` Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 37/48] avr32: atngw100: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 38/48] ia64: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 39/48] m68k: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 40/48] mips: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 41/48] powerpc: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 42/48] sh: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 43/48] x86: lguest: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 44/48] x86: ce4100: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 45/48] x86: intel-mid: Drop registration of dummy power-off handlers Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 46/48] x86: pmc_atom: Register power-off handler with kernel power-off handler Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 47/48] efi: " Guenter Roeck
2014-11-06 16:43 ` [PATCH v5 48/48] kernel: Remove pm_power_off Guenter Roeck
2014-11-06 17:08 ` [PATCH v5 00/48] kernel: Add support for power-off handler call chain Guenter Roeck
2014-11-06 18:02 ` Linus Torvalds
2014-11-06 18:48 ` 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=1415292213-28652-29-git-send-email-linux@roeck-us.net \
--to=linux@roeck-us.net \
--cc=dbaryshkov@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=sre@kernel.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).