Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

s390/sclp: Remove quiesce power management support

Power management support was removed for s390 with
commit 394216275c7d ("s390: remove broken hibernate / power management
support").

Remove leftover sclp quiesce-related power management code.

Acked-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Peter Oberparleiter <oberpar@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

authored by

Peter Oberparleiter and committed by
Vasily Gorbik
9b357ccd fc8ebe82

+3 -34
+3 -34
drivers/s390/char/sclp_quiesce.c
··· 18 18 19 19 #include "sclp.h" 20 20 21 - static void (*old_machine_restart)(char *); 22 - static void (*old_machine_halt)(void); 23 - static void (*old_machine_power_off)(void); 24 - 25 21 /* Shutdown handler. Signal completion of shutdown by loading special PSW. */ 26 22 static void do_machine_quiesce(void) 27 23 { ··· 33 37 /* Handler for quiesce event. Start shutdown procedure. */ 34 38 static void sclp_quiesce_handler(struct evbuf_header *evbuf) 35 39 { 36 - if (_machine_restart != (void *) do_machine_quiesce) { 37 - old_machine_restart = _machine_restart; 38 - old_machine_halt = _machine_halt; 39 - old_machine_power_off = _machine_power_off; 40 - _machine_restart = (void *) do_machine_quiesce; 41 - _machine_halt = do_machine_quiesce; 42 - _machine_power_off = do_machine_quiesce; 43 - } 40 + _machine_restart = (void *) do_machine_quiesce; 41 + _machine_halt = do_machine_quiesce; 42 + _machine_power_off = do_machine_quiesce; 44 43 ctrl_alt_del(); 45 - } 46 - 47 - /* Undo machine restart/halt/power_off modification on resume */ 48 - static void sclp_quiesce_pm_event(struct sclp_register *reg, 49 - enum sclp_pm_event sclp_pm_event) 50 - { 51 - switch (sclp_pm_event) { 52 - case SCLP_PM_EVENT_RESTORE: 53 - if (old_machine_restart) { 54 - _machine_restart = old_machine_restart; 55 - _machine_halt = old_machine_halt; 56 - _machine_power_off = old_machine_power_off; 57 - old_machine_restart = NULL; 58 - old_machine_halt = NULL; 59 - old_machine_power_off = NULL; 60 - } 61 - break; 62 - case SCLP_PM_EVENT_FREEZE: 63 - case SCLP_PM_EVENT_THAW: 64 - break; 65 - } 66 44 } 67 45 68 46 static struct sclp_register sclp_quiesce_event = { 69 47 .receive_mask = EVTYP_SIGQUIESCE_MASK, 70 48 .receiver_fn = sclp_quiesce_handler, 71 - .pm_event_fn = sclp_quiesce_pm_event 72 49 }; 73 50 74 51 /* Initialize quiesce driver. */