diff options
author | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:19:12 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:37:18 (GMT) |
commit | 86ba38e6f5f2fbfe9b49e153ea89593b26482019 (patch) | |
tree | f99d2906b0eafca507f37289e68052fc105cc2dc /kernel/power | |
parent | 07c8b57b111585a617b2b456497fc9b33c00743c (diff) | |
download | linux-fsl-qoriq-86ba38e6f5f2fbfe9b49e153ea89593b26482019.tar.xz |
Reset to 3.12.19
Diffstat (limited to 'kernel/power')
-rw-r--r-- | kernel/power/hibernate.c | 7 | ||||
-rw-r--r-- | kernel/power/suspend.c | 4 |
2 files changed, 0 insertions, 11 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index d26958b..0121dab 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -275,8 +275,6 @@ static int create_image(int platform_mode) local_irq_disable(); - system_state = SYSTEM_SUSPEND; - error = syscore_suspend(); if (error) { printk(KERN_ERR "PM: Some system devices failed to power down, " @@ -304,7 +302,6 @@ static int create_image(int platform_mode) syscore_resume(); Enable_irqs: - system_state = SYSTEM_RUNNING; local_irq_enable(); Enable_cpus: @@ -430,7 +427,6 @@ static int resume_target_kernel(bool platform_mode) goto Enable_cpus; local_irq_disable(); - system_state = SYSTEM_SUSPEND; error = syscore_suspend(); if (error) @@ -464,7 +460,6 @@ static int resume_target_kernel(bool platform_mode) syscore_resume(); Enable_irqs: - system_state = SYSTEM_RUNNING; local_irq_enable(); Enable_cpus: @@ -547,7 +542,6 @@ int hibernation_platform_enter(void) goto Platform_finish; local_irq_disable(); - system_state = SYSTEM_SUSPEND; syscore_suspend(); if (pm_wakeup_pending()) { error = -EAGAIN; @@ -560,7 +554,6 @@ int hibernation_platform_enter(void) Power_up: syscore_resume(); - system_state = SYSTEM_RUNNING; local_irq_enable(); enable_nonboot_cpus(); diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index e6703bb..62ee437 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -218,8 +218,6 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) arch_suspend_disable_irqs(); BUG_ON(!irqs_disabled()); - system_state = SYSTEM_SUSPEND; - error = syscore_suspend(); if (!error) { *wakeup = pm_wakeup_pending(); @@ -230,8 +228,6 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) syscore_resume(); } - system_state = SYSTEM_RUNNING; - arch_suspend_enable_irqs(); BUG_ON(irqs_disabled()); |