[PATCH 35/44] m68k: Register with kernel poweroff handler
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
- To: linux-kernel@xxxxxxxxxxxxxxx
- Subject: [PATCH 35/44] m68k: Register with kernel poweroff handler
- From: Guenter Roeck <linux@xxxxxxxxxxxx>
- Date: Mon, 6 Oct 2014 22:28:37 -0700
- Cc: adi-buildroot-devel@xxxxxxxxxxxxxxxxxxxxx, devel@xxxxxxxxxxxxxxxxxxxx, devicetree@xxxxxxxxxxxxxxx, lguest@xxxxxxxxxxxxxxxx, linux-acpi@xxxxxxxxxxxxxxx, linux-alpha@xxxxxxxxxxxxxxx, linux-am33-list@xxxxxxxxxx, linux-cris-kernel@xxxxxxxx, linux-efi@xxxxxxxxxxxxxxx, linux-hexagon@xxxxxxxxxxxxxxx, linux-m32r-ja@xxxxxxxxxxxxxxxxxxxxx, linuxppc-dev@xxxxxxxxxxxxxxxx, linux-s390@xxxxxxxxxxxxxxx, linux-tegra@xxxxxxxxxxxxxxx, linux-xtensa@xxxxxxxxxxxxxxxx, openipmi-developer@xxxxxxxxxxxxxxxxxxxxx, user-mode-linux-devel@xxxxxxxxxxxxxxxxxxxxx, linux-arm-kernel@xxxxxxxxxxxxxxxxxxx, linux-c6x-dev@xxxxxxxxxxxxx, linux-ia64@xxxxxxxxxxxxxxx, linux-m68k@xxxxxxxxxxxxxxx, linux-metag@xxxxxxxxxxxxxxx, linux-mips@xxxxxxxxxxxxxx, linux-parisc@xxxxxxxxxxxxxxx, linux-pm@xxxxxxxxxxxxxxx, linux-sh@xxxxxxxxxxxxxxx, xen-devel@xxxxxxxxxxxxxxxxxxxx, Guenter Roeck <linux@xxxxxxxxxxxx>, Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>, Joshua Thompson <funaho@xxxxxxxxx>
- In-reply-to: <1412659726-29957-1-git-send-email-linux@roeck-us.net>
- List-id: <linux-ia64.vger.kernel.org>
- References: <1412659726-29957-1-git-send-email-linux@roeck-us.net>
Register with kernel poweroff handler instead of setting pm_power_off
directly.
Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Cc: Joshua Thompson <funaho@xxxxxxxxx>
Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
---
arch/m68k/emu/natfeat.c | 2 +-
arch/m68k/mac/config.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/m68k/emu/natfeat.c b/arch/m68k/emu/natfeat.c
index 91e2ae7..c4d5bd8 100644
--- a/arch/m68k/emu/natfeat.c
+++ b/arch/m68k/emu/natfeat.c
@@ -91,5 +91,5 @@ void __init nf_init(void)
pr_info("NatFeats found (%s, %lu.%lu)\n", buf, version >> 16,
version & 0xffff);
- pm_power_off = nf_poweroff;
+ register_poweroff_handler_simple(nf_poweroff, 128);
}
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 677913ff..5d8e2e6 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -160,7 +160,7 @@ void __init config_mac(void)
mach_set_clock_mmss = mac_set_clock_mmss;
mach_reset = mac_reset;
mach_halt = mac_poweroff;
- pm_power_off = mac_poweroff;
+ register_poweroff_handler_simple(mac_poweroff, 128);
mach_max_dma_address = 0xffffffff;
#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
mach_beep = mac_mksound;
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
[Index of Archives]
[Linux Kernel]
[Sparc Linux]
[DCCP]
[Linux ARM]
[Yosemite News]
[Linux SCSI]
[Linux x86_64]
[Linux for Ham Radio]