| Message ID | 1412659726-29957-36-git-send-email-linux@roeck-us.net (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Tue, Oct 7, 2014 at 7:28 AM, Guenter Roeck <linux@roeck-us.net> wrote: > 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> As someone already mentioned, having #defines instead of hardcoded numbers for the priorities would be nice. Apart from that: Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> > + register_poweroff_handler_simple(nf_poweroff, 128); > + register_poweroff_handler_simple(mac_poweroff, 128); Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
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(-)