[PATCH 35/44] m68k: Register with kernel poweroff handler
From: Guenter Roeck <linux@roeck-us.net>
Date: 2014-10-07 05:39:25
Also in:
linux-acpi, linux-alpha, linux-arm-kernel, linux-devicetree, linux-efi, linux-mips, linux-pm, linux-sh, linux-tegra, linux-um, lkml
Subsystem:
m68k architecture, m68k on apple macintosh, the rest · Maintainers:
Geert Uytterhoeven, Joshua Thompson, Linus Torvalds
Register with kernel poweroff handler instead of setting pm_power_off directly. Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Joshua Thompson <funaho@jurai.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- 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