]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ACPI / PM: acpi_suspend_enter() need not switch interrupts off
authorRafael J. Wysocki <rjw@sisk.pl>
Tue, 8 Feb 2011 22:41:47 +0000 (23:41 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Thu, 24 Feb 2011 18:58:54 +0000 (19:58 +0100)
The function acpi_suspend_enter() is always called with interrupts
off, so it doesn't need to switch them off and on.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
drivers/acpi/sleep.c

index 67dcd3886563251cba8ad113fa0c6cca090bd682..3b549379801a605d7ed68a2185f9cea16c02423e 100644 (file)
@@ -243,7 +243,6 @@ 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;
 
        ACPI_FLUSH_CPU_CACHE();
@@ -256,7 +255,6 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
                        return error;
        }
 
-       local_irq_save(flags);
        switch (acpi_state) {
        case ACPI_STATE_S1:
                barrier();
@@ -290,7 +288,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");
 
        suspend_nvs_restore();