1 files changed, 5 insertions, 23 deletions

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index d6a8cd14de2e..84f57143ad7c 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -199,8 +199,6 @@ static void acpi_pm_end(void)
 #endif /* CONFIG_ACPI_SLEEP */
 
 #ifdef CONFIG_SUSPEND
-extern void do_suspend_lowlevel(void);
-
 static u32 acpi_suspend_states[] = {
         [PM_SUSPEND_ON] = ACPI_STATE_S0,
         [PM_SUSPEND_STANDBY] = ACPI_STATE_S1,
@@ -243,20 +241,11 @@ static int acpi_suspend_begin(suspend_state_t pm_state)
 static int acpi_suspend_enter(suspend_state_t pm_state)
 {
         acpi_status status = AE_OK;
-        unsigned long flags = 0;
         u32 acpi_state = acpi_target_sleep_state;
+        int error;
 
         ACPI_FLUSH_CPU_CACHE();
 
-        /* Do arch specific saving of state. */
-        if (acpi_state == ACPI_STATE_S3) {
-                int error = acpi_save_state_mem();
-
-                if (error)
-                        return error;
-        }
-
-        local_irq_save(flags);
         switch (acpi_state) {
         case ACPI_STATE_S1:
                 barrier();
@@ -264,7 +253,10 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
                 break;
 
         case ACPI_STATE_S3:
-                do_suspend_lowlevel();
+                error = acpi_suspend_lowlevel();
+                if (error)
+                        return error;
+                pr_info(PREFIX "Low-level resume complete\n");
                 break;
         }
 
@@ -290,13 +282,6 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
         /* Allow EC transactions to happen. */
         acpi_ec_unblock_transactions_early();
 
-        local_irq_restore(flags);
-        printk(KERN_DEBUG "Back to C!\n");
-
-        /* restore processor state */
-        if (acpi_state == ACPI_STATE_S3)
-                acpi_restore_state_mem();
-
         suspend_nvs_restore();
 
         return ACPI_SUCCESS(status) ? 0 : -EFAULT;
@@ -472,16 +457,13 @@ static int acpi_hibernation_begin(void)
 static int acpi_hibernation_enter(void)
 {
         acpi_status status = AE_OK;
-        unsigned long flags = 0;
 
         ACPI_FLUSH_CPU_CACHE();
 
-        local_irq_save(flags);
         /* This shouldn't return.  If it returns, we have a problem */
         status = acpi_enter_sleep_state(ACPI_STATE_S4);
         /* Reprogram control registers and execute _BFS */
         acpi_leave_sleep_state_prep(ACPI_STATE_S4);
-        local_irq_restore(flags);
 
         return ACPI_SUCCESS(status) ? 0 : -EFAULT;
 }