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 v5 42/48] sh: Register with kernel power-off handler Date: Thu, 06 Nov 2014 16:43:26 +0000 [thread overview] Message-ID: <1415292213-28652-43-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. Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- v5: - Rebase to v3.18-rc3 v4: - No change 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: - 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..f7d2ffb 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, + POWER_OFF_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..8f44256 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, + POWER_OFF_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..fc9110a 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, + POWER_OFF_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..56adabc 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, + POWER_OFF_PRIORITY_DEFAULT); } /* diff --git a/arch/sh/boards/mach-r2d/setup.c b/arch/sh/boards/mach-r2d/setup.c index 4b98a52..4a23bce 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, + POWER_OFF_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..2d77760 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, + POWER_OFF_PRIORITY_DEFAULT); register_smp_ops(&shx3_smp_ops); } -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
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 v5 42/48] sh: Register with kernel power-off handler Date: Thu, 6 Nov 2014 08:43:26 -0800 [thread overview] Message-ID: <1415292213-28652-43-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. Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- v5: - Rebase to v3.18-rc3 v4: - No change 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: - 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..f7d2ffb 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, + POWER_OFF_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..8f44256 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, + POWER_OFF_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..fc9110a 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, + POWER_OFF_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..56adabc 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, + POWER_OFF_PRIORITY_DEFAULT); } /* diff --git a/arch/sh/boards/mach-r2d/setup.c b/arch/sh/boards/mach-r2d/setup.c index 4b98a52..4a23bce 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, + POWER_OFF_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..2d77760 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, + POWER_OFF_PRIORITY_DEFAULT); register_smp_ops(&shx3_smp_ops); } -- 1.9.1
next prev parent reply other threads:[~2014-11-06 16:43 UTC|newest] Thread overview: 97+ 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 ` Guenter Roeck 2014-11-06 16:42 ` Guenter Roeck 2014-11-06 16:42 ` [PATCH v5 05/48] mfd: as3722: Drop reference to pm_power_off from devicetree bindings Guenter Roeck 2014-11-06 16:42 ` [PATCH v5 06/48] gpio-poweroff: " Guenter Roeck 2014-11-06 16:42 ` 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 ` Guenter Roeck 2014-11-06 16:42 ` Guenter Roeck 2014-11-06 16:42 ` Guenter Roeck 2014-11-06 16:42 ` Guenter Roeck 2014-11-06 16:42 ` Guenter Roeck 2014-11-06 16:42 ` Guenter Roeck 2014-11-06 16:42 ` 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 ` Guenter Roeck 2014-11-06 16:42 ` 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 ` [PATCH v5 28/48] power/reset: at91-poweroff: " Guenter Roeck 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 2014-11-06 16:43 ` 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 21:41 ` Marc Dietrich 2014-11-09 23:06 ` Andreas Färber 2014-11-09 23:06 ` Andreas Färber 2014-11-09 23:54 ` Guenter Roeck 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 ` Guenter Roeck 2014-11-06 16:43 ` Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 36/48] arm64: psci: " Guenter Roeck 2014-11-06 16:43 ` Guenter Roeck 2014-11-06 17:22 ` Mark Rutland 2014-11-06 17:22 ` Mark Rutland 2014-11-06 17:22 ` Mark Rutland 2014-11-06 18:51 ` Guenter Roeck 2014-11-06 18:51 ` Guenter Roeck 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 ` Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 39/48] m68k: " Guenter Roeck 2014-11-06 16:43 ` Guenter Roeck 2014-11-06 16:43 ` 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 ` Guenter Roeck 2014-11-06 16:43 ` Guenter Roeck [this message] 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 17:08 ` 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-43-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.