linux-pm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	linux-sh@vger.kernel.org
Subject: [PATCH v2 41/47] sh: Register with kernel poweroff handler
Date: Mon, 20 Oct 2014 21:12:57 -0700	[thread overview]
Message-ID: <1413864783-3271-42-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1413864783-3271-1-git-send-email-linux@roeck-us.net>

Register with kernel poweroff handler instead of setting pm_power_off
directly.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
- Use defines to specify poweroff handler priorities

 arch/sh/boards/board-sh7785lcr.c       | 3 ++-
 arch/sh/boards/board-urquell.c         | 3 ++-
 arch/sh/boards/mach-highlander/setup.c | 3 ++-
 arch/sh/boards/mach-landisk/setup.c    | 3 ++-
 arch/sh/boards/mach-r2d/setup.c        | 3 ++-
 arch/sh/boards/mach-sdk7786/setup.c    | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/arch/sh/boards/board-sh7785lcr.c b/arch/sh/boards/board-sh7785lcr.c
index 2c4771e..ada9f6a 100644
--- a/arch/sh/boards/board-sh7785lcr.c
+++ b/arch/sh/boards/board-sh7785lcr.c
@@ -332,7 +332,8 @@ static void __init sh7785lcr_setup(char **cmdline_p)
 
 	printk(KERN_INFO "Renesas Technology Corp. R0P7785LC0011RL support.\n");
 
-	pm_power_off = sh7785lcr_power_off;
+	register_power_off_handler_simple(sh7785lcr_power_off,
+					  POWEROFF_PRIORITY_DEFAULT);
 
 	/* sm501 DRAM configuration */
 	sm501_reg = ioremap_nocache(SM107_REG_ADDR, SM501_DRAM_CONTROL);
diff --git a/arch/sh/boards/board-urquell.c b/arch/sh/boards/board-urquell.c
index b52abcc..2188fee 100644
--- a/arch/sh/boards/board-urquell.c
+++ b/arch/sh/boards/board-urquell.c
@@ -204,7 +204,8 @@ static void __init urquell_setup(char **cmdline_p)
 {
 	printk(KERN_INFO "Renesas Technology Corp. Urquell support.\n");
 
-	pm_power_off = urquell_power_off;
+	register_power_off_handler_simple(urquell_power_off,
+					  POWEROFF_PRIORITY_DEFAULT);
 
 	register_smp_ops(&shx3_smp_ops);
 }
diff --git a/arch/sh/boards/mach-highlander/setup.c b/arch/sh/boards/mach-highlander/setup.c
index 4a52590..efb848a 100644
--- a/arch/sh/boards/mach-highlander/setup.c
+++ b/arch/sh/boards/mach-highlander/setup.c
@@ -385,7 +385,8 @@ static void __init highlander_setup(char **cmdline_p)
 
 	__raw_writew(__raw_readw(PA_IVDRCTL) | 0x01, PA_IVDRCTL);	/* Si13112 */
 
-	pm_power_off = r7780rp_power_off;
+	register_power_off_handler_simple(r7780rp_power_off,
+					  POWEROFF_PRIORITY_DEFAULT);
 }
 
 static unsigned char irl2irq[HL_NR_IRL];
diff --git a/arch/sh/boards/mach-landisk/setup.c b/arch/sh/boards/mach-landisk/setup.c
index f1147ca..50d9388 100644
--- a/arch/sh/boards/mach-landisk/setup.c
+++ b/arch/sh/boards/mach-landisk/setup.c
@@ -89,7 +89,8 @@ static void __init landisk_setup(char **cmdline_p)
 	__raw_writeb(__raw_readb(PA_LED) | 0x03, PA_LED);
 
 	printk(KERN_INFO "I-O DATA DEVICE, INC. \"LANDISK Series\" support.\n");
-	pm_power_off = landisk_power_off;
+	register_power_off_handler_simple(landisk_power_off,
+					  POWEROFF_PRIORITY_DEFAULT);
 }
 
 /*
diff --git a/arch/sh/boards/mach-r2d/setup.c b/arch/sh/boards/mach-r2d/setup.c
index 4b98a52..28add25 100644
--- a/arch/sh/boards/mach-r2d/setup.c
+++ b/arch/sh/boards/mach-r2d/setup.c
@@ -279,7 +279,8 @@ static void __init rts7751r2d_setup(char **cmdline_p)
 					(ver >> 4) & 0xf, ver & 0xf);
 
 	__raw_writew(0x0000, PA_OUTPORT);
-	pm_power_off = rts7751r2d_power_off;
+	register_power_off_handler_simple(rts7751r2d_power_off,
+					  POWEROFF_PRIORITY_DEFAULT);
 
 	/* sm501 dram configuration:
 	 * ColSizeX = 11 - External Memory Column Size: 256 words.
diff --git a/arch/sh/boards/mach-sdk7786/setup.c b/arch/sh/boards/mach-sdk7786/setup.c
index c29268b..eee7b9c 100644
--- a/arch/sh/boards/mach-sdk7786/setup.c
+++ b/arch/sh/boards/mach-sdk7786/setup.c
@@ -252,7 +252,8 @@ static void __init sdk7786_setup(char **cmdline_p)
 	pr_info("\tPCB revision:\t%d\n", fpga_read_reg(PCBRR) & 0xf);
 
 	machine_ops.restart = sdk7786_restart;
-	pm_power_off = sdk7786_power_off;
+	register_power_off_handler_simple(sdk7786_power_off,
+					  POWEROFF_PRIORITY_DEFAULT);
 
 	register_smp_ops(&shx3_smp_ops);
 }
-- 
1.9.1


  parent reply	other threads:[~2014-10-21  4:12 UTC|newest]

Thread overview: 92+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-21  4:12 [PATCH v2 00/47] kernel: Add support for poweroff handler call chain Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 01/47] " Guenter Roeck
2014-10-21  6:46   ` Philippe Rétornaz
2014-10-21 13:29     ` Guenter Roeck
2014-10-22  8:02       ` Philippe Rétornaz
2014-10-22 13:22         ` Guenter Roeck
2014-10-21  9:34   ` Johan Hovold
2014-10-21 10:30     ` Lee Jones
2014-10-21 13:32       ` Guenter Roeck
2014-10-21 13:34     ` Guenter Roeck
2014-10-21 15:50     ` Guenter Roeck
2014-10-21 18:27       ` Johan Hovold
2014-10-21 12:26   ` Rafael J. Wysocki
2014-10-21 12:44     ` Heiko Stübner
2014-10-21 13:17     ` Guenter Roeck
2014-10-21 14:15       ` Rafael J. Wysocki
2014-10-21 16:11         ` Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 02/47] memory: emif: Use API function to determine poweroff capability Guenter Roeck
2014-10-22 18:48   ` Santosh Shilimkar
2014-10-22 22:18     ` Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 03/47] hibernate: Call have_kernel_power_off instead of checking pm_power_off Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 04/47] m68k: Replace mach_power_off with pm_power_off Guenter Roeck
2014-10-22  3:50   ` Greg Ungerer
2014-10-21  4:12 ` [PATCH v2 05/47] mfd: as3722: Drop reference to pm_power_off from devicetree bindings Guenter Roeck
2014-10-21  8:15   ` Lee Jones
2014-10-21  4:12 ` [PATCH v2 06/47] gpio-poweroff: " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 07/47] qnap-poweroff: " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 08/47] kernel: Move pm_power_off to common code Guenter Roeck
2014-10-22 15:31   ` Ralf Baechle
2014-10-22 15:43     ` Guenter Roeck
2014-10-24  9:47   ` James Hogan
2014-10-24 15:53     ` Guenter Roeck
2014-10-24 10:02   ` [uml-user] " Lennox Wu
2014-10-24 10:03   ` Lennox Wu
2014-10-21  4:12 ` [PATCH v2 09/47] mfd: palmas: Register with kernel poweroff handler Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 10/47] mfd: axp20x: " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 11/47] mfd: retu: " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 12/47] mfd: ab8500-sysctrl: " Guenter Roeck
2014-10-27 15:59   ` Linus Walleij
2014-10-27 16:42     ` Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 13/47] mfd: max8907: " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 14/47] mfd: tps80031: " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 15/47] mfd: dm355evm_msp: " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 16/47] mfd: tps6586x: " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 17/47] mfd: tps65910: " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 18/47] mfd: twl4030-power: " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 19/47] mfd: rk808: Register poweroff handler " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 20/47] mfd: rn5t618: " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 21/47] ipmi: Register " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 22/47] power/reset: restart-poweroff: " Guenter Roeck
2014-10-22 21:32   ` Sebastian Reichel
2014-10-22 22:19     ` Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 23/47] power/reset: gpio-poweroff: " Guenter Roeck
2014-10-22 21:32   ` Sebastian Reichel
2014-10-21  4:12 ` [PATCH v2 24/47] power/reset: as3722-poweroff: " Guenter Roeck
2014-10-22 21:33   ` Sebastian Reichel
2014-10-21  4:12 ` [PATCH v2 25/47] power/reset: qnap-poweroff: " Guenter Roeck
2014-10-22 21:33   ` Sebastian Reichel
2014-10-21  4:12 ` [PATCH v2 26/47] power/reset: msm-poweroff: " Guenter Roeck
2014-10-22 21:33   ` Sebastian Reichel
2014-10-21  4:12 ` [PATCH v2 27/47] power/reset: vexpress-poweroff: " Guenter Roeck
2014-10-22 21:34   ` Sebastian Reichel
2014-10-21  4:12 ` [PATCH v2 28/47] power/reset: at91-poweroff: " Guenter Roeck
2014-10-22 21:34   ` Sebastian Reichel
2014-10-21  4:12 ` [PATCH v2 29/47] power/reset: ltc2952-poweroff: " Guenter Roeck
2014-10-22 21:35   ` Sebastian Reichel
2014-10-21  4:12 ` [PATCH v2 30/47] x86: iris: " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 31/47] x86: apm: " Guenter Roeck
2014-10-21  8:46   ` Jiri Kosina
2014-10-21  4:12 ` [PATCH v2 32/47] x86: olpc: Register xo1 poweroff handler " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 33/47] staging: nvec: Register " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 34/47] acpi: Register poweroff handler " Guenter Roeck
2014-10-21 12:27   ` Rafael J. Wysocki
2014-10-21  4:12 ` [PATCH v2 35/47] arm: Register " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 36/47] arm64: psci: " Guenter Roeck
2014-10-22 11:23   ` Catalin Marinas
2014-10-22 15:38     ` Guenter Roeck
2014-10-22 12:52   ` Mark Rutland
2014-10-22 15:37     ` Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 37/47] avr32: atngw100: " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 38/47] ia64: " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 39/47] m68k: " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 40/47] mips: " Guenter Roeck
2014-10-22 15:32   ` Ralf Baechle
2014-10-22 15:44     ` Guenter Roeck
2014-10-21  4:12 ` Guenter Roeck [this message]
2014-10-21  4:12 ` [PATCH v2 42/47] x86: lguest: " Guenter Roeck
2014-10-21  4:12 ` [PATCH v2 43/47] x86: ce4100: " Guenter Roeck
2014-10-21  4:13 ` [PATCH v2 44/47] x86: intel-mid: Drop registration of dummy poweroff handlers Guenter Roeck
2014-10-21  4:13 ` [PATCH v2 45/47] x86: pmc_atom: Register poweroff handler with kernel poweroff handler Guenter Roeck
2014-10-21  4:13 ` [PATCH v2 46/47] efi: " Guenter Roeck
2014-10-21  4:13 ` [PATCH v2 47/47] kernel: Remove pm_power_off 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=1413864783-3271-42-git-send-email-linux@roeck-us.net \
    --to=linux@roeck-us.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-sh@vger.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).