PM: Remove sysdev suspend, resume and shutdown operations
Since suspend, resume and shutdown operations in struct sysdev_class and struct sysdev_driver are not used any more, remove them. Also drop sysdev_suspend(), sysdev_resume() and sysdev_shutdown() used for executing those operations and modify all of their users accordingly. This reduces kernel code size quite a bit and reduces its complexity. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
+1
-8
@@ -1531,13 +1531,7 @@ int kernel_kexec(void)
|
||||
if (error)
|
||||
goto Enable_cpus;
|
||||
local_irq_disable();
|
||||
/* Suspend system devices */
|
||||
error = sysdev_suspend(PMSG_FREEZE);
|
||||
if (!error) {
|
||||
error = syscore_suspend();
|
||||
if (error)
|
||||
sysdev_resume();
|
||||
}
|
||||
error = syscore_suspend();
|
||||
if (error)
|
||||
goto Enable_irqs;
|
||||
} else
|
||||
@@ -1553,7 +1547,6 @@ int kernel_kexec(void)
|
||||
#ifdef CONFIG_KEXEC_JUMP
|
||||
if (kexec_image->preserve_context) {
|
||||
syscore_resume();
|
||||
sysdev_resume();
|
||||
Enable_irqs:
|
||||
local_irq_enable();
|
||||
Enable_cpus:
|
||||
|
||||
@@ -272,12 +272,7 @@ static int create_image(int platform_mode)
|
||||
|
||||
local_irq_disable();
|
||||
|
||||
error = sysdev_suspend(PMSG_FREEZE);
|
||||
if (!error) {
|
||||
error = syscore_suspend();
|
||||
if (error)
|
||||
sysdev_resume();
|
||||
}
|
||||
error = syscore_suspend();
|
||||
if (error) {
|
||||
printk(KERN_ERR "PM: Some system devices failed to power down, "
|
||||
"aborting hibernation\n");
|
||||
@@ -302,7 +297,6 @@ static int create_image(int platform_mode)
|
||||
|
||||
Power_up:
|
||||
syscore_resume();
|
||||
sysdev_resume();
|
||||
/* NOTE: dpm_resume_noirq() is just a resume() for devices
|
||||
* that suspended with irqs off ... no overall powerup.
|
||||
*/
|
||||
@@ -409,12 +403,7 @@ static int resume_target_kernel(bool platform_mode)
|
||||
|
||||
local_irq_disable();
|
||||
|
||||
error = sysdev_suspend(PMSG_QUIESCE);
|
||||
if (!error) {
|
||||
error = syscore_suspend();
|
||||
if (error)
|
||||
sysdev_resume();
|
||||
}
|
||||
error = syscore_suspend();
|
||||
if (error)
|
||||
goto Enable_irqs;
|
||||
|
||||
@@ -442,7 +431,6 @@ static int resume_target_kernel(bool platform_mode)
|
||||
touch_softlockup_watchdog();
|
||||
|
||||
syscore_resume();
|
||||
sysdev_resume();
|
||||
|
||||
Enable_irqs:
|
||||
local_irq_enable();
|
||||
@@ -528,7 +516,6 @@ int hibernation_platform_enter(void)
|
||||
goto Platform_finish;
|
||||
|
||||
local_irq_disable();
|
||||
sysdev_suspend(PMSG_HIBERNATE);
|
||||
syscore_suspend();
|
||||
if (pm_wakeup_pending()) {
|
||||
error = -EAGAIN;
|
||||
@@ -541,7 +528,6 @@ int hibernation_platform_enter(void)
|
||||
|
||||
Power_up:
|
||||
syscore_resume();
|
||||
sysdev_resume();
|
||||
local_irq_enable();
|
||||
enable_nonboot_cpus();
|
||||
|
||||
|
||||
@@ -163,19 +163,13 @@ static int suspend_enter(suspend_state_t state)
|
||||
arch_suspend_disable_irqs();
|
||||
BUG_ON(!irqs_disabled());
|
||||
|
||||
error = sysdev_suspend(PMSG_SUSPEND);
|
||||
if (!error) {
|
||||
error = syscore_suspend();
|
||||
if (error)
|
||||
sysdev_resume();
|
||||
}
|
||||
error = syscore_suspend();
|
||||
if (!error) {
|
||||
if (!(suspend_test(TEST_CORE) || pm_wakeup_pending())) {
|
||||
error = suspend_ops->enter(state);
|
||||
events_check_enabled = false;
|
||||
}
|
||||
syscore_resume();
|
||||
sysdev_resume();
|
||||
}
|
||||
|
||||
arch_suspend_enable_irqs();
|
||||
|
||||
@@ -315,7 +315,6 @@ void kernel_restart_prepare(char *cmd)
|
||||
blocking_notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd);
|
||||
system_state = SYSTEM_RESTART;
|
||||
device_shutdown();
|
||||
sysdev_shutdown();
|
||||
syscore_shutdown();
|
||||
}
|
||||
|
||||
@@ -354,7 +353,6 @@ static void kernel_shutdown_prepare(enum system_states state)
|
||||
void kernel_halt(void)
|
||||
{
|
||||
kernel_shutdown_prepare(SYSTEM_HALT);
|
||||
sysdev_shutdown();
|
||||
syscore_shutdown();
|
||||
printk(KERN_EMERG "System halted.\n");
|
||||
kmsg_dump(KMSG_DUMP_HALT);
|
||||
@@ -374,7 +372,6 @@ void kernel_power_off(void)
|
||||
if (pm_power_off_prepare)
|
||||
pm_power_off_prepare();
|
||||
disable_nonboot_cpus();
|
||||
sysdev_shutdown();
|
||||
syscore_shutdown();
|
||||
printk(KERN_EMERG "Power down.\n");
|
||||
kmsg_dump(KMSG_DUMP_POWEROFF);
|
||||
|
||||
Reference in New Issue
Block a user