diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-02-08 17:41:47 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-02-24 13:58:54 -0500 |
commit | 82911fe1988fadfc9c01673202cbc411aa803244 (patch) | |
tree | 88dc7ed1b7a23fbb02d76f9d22f592362119334d /drivers/acpi | |
parent | c41b93fb8551148a93d3bba870365e8489317f02 (diff) |
ACPI / PM: acpi_suspend_enter() need not switch interrupts off
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>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/sleep.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 67dcd3886563..3b549379801a 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
@@ -243,7 +243,6 @@ static int acpi_suspend_begin(suspend_state_t pm_state) | |||
243 | static int acpi_suspend_enter(suspend_state_t pm_state) | 243 | static int acpi_suspend_enter(suspend_state_t pm_state) |
244 | { | 244 | { |
245 | acpi_status status = AE_OK; | 245 | acpi_status status = AE_OK; |
246 | unsigned long flags = 0; | ||
247 | u32 acpi_state = acpi_target_sleep_state; | 246 | u32 acpi_state = acpi_target_sleep_state; |
248 | 247 | ||
249 | ACPI_FLUSH_CPU_CACHE(); | 248 | ACPI_FLUSH_CPU_CACHE(); |
@@ -256,7 +255,6 @@ static int acpi_suspend_enter(suspend_state_t pm_state) | |||
256 | return error; | 255 | return error; |
257 | } | 256 | } |
258 | 257 | ||
259 | local_irq_save(flags); | ||
260 | switch (acpi_state) { | 258 | switch (acpi_state) { |
261 | case ACPI_STATE_S1: | 259 | case ACPI_STATE_S1: |
262 | barrier(); | 260 | barrier(); |
@@ -290,7 +288,6 @@ static int acpi_suspend_enter(suspend_state_t pm_state) | |||
290 | /* Allow EC transactions to happen. */ | 288 | /* Allow EC transactions to happen. */ |
291 | acpi_ec_unblock_transactions_early(); | 289 | acpi_ec_unblock_transactions_early(); |
292 | 290 | ||
293 | local_irq_restore(flags); | ||
294 | printk(KERN_DEBUG "Back to C!\n"); | 291 | printk(KERN_DEBUG "Back to C!\n"); |
295 | 292 | ||
296 | suspend_nvs_restore(); | 293 | suspend_nvs_restore(); |