diff options
Diffstat (limited to 'drivers/acpi/sleep.c')
-rw-r--r-- | drivers/acpi/sleep.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 24741ac65897..504a55edac49 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
@@ -116,7 +116,7 @@ static int acpi_pm_freeze(void) | |||
116 | { | 116 | { |
117 | acpi_disable_all_gpes(); | 117 | acpi_disable_all_gpes(); |
118 | acpi_os_wait_events_complete(NULL); | 118 | acpi_os_wait_events_complete(NULL); |
119 | acpi_ec_suspend_transactions(); | 119 | acpi_ec_block_transactions(); |
120 | return 0; | 120 | return 0; |
121 | } | 121 | } |
122 | 122 | ||
@@ -279,7 +279,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state) | |||
279 | */ | 279 | */ |
280 | acpi_disable_all_gpes(); | 280 | acpi_disable_all_gpes(); |
281 | /* Allow EC transactions to happen. */ | 281 | /* Allow EC transactions to happen. */ |
282 | acpi_ec_resume_transactions_early(); | 282 | acpi_ec_unblock_transactions_early(); |
283 | 283 | ||
284 | local_irq_restore(flags); | 284 | local_irq_restore(flags); |
285 | printk(KERN_DEBUG "Back to C!\n"); | 285 | printk(KERN_DEBUG "Back to C!\n"); |
@@ -293,7 +293,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state) | |||
293 | 293 | ||
294 | static void acpi_suspend_finish(void) | 294 | static void acpi_suspend_finish(void) |
295 | { | 295 | { |
296 | acpi_ec_resume_transactions(); | 296 | acpi_ec_unblock_transactions(); |
297 | acpi_pm_finish(); | 297 | acpi_pm_finish(); |
298 | } | 298 | } |
299 | 299 | ||
@@ -597,7 +597,7 @@ static int acpi_hibernation_enter(void) | |||
597 | static void acpi_hibernation_finish(void) | 597 | static void acpi_hibernation_finish(void) |
598 | { | 598 | { |
599 | hibernate_nvs_free(); | 599 | hibernate_nvs_free(); |
600 | acpi_ec_resume_transactions(); | 600 | acpi_ec_unblock_transactions(); |
601 | acpi_pm_finish(); | 601 | acpi_pm_finish(); |
602 | } | 602 | } |
603 | 603 | ||
@@ -619,12 +619,12 @@ static void acpi_hibernation_leave(void) | |||
619 | /* Restore the NVS memory area */ | 619 | /* Restore the NVS memory area */ |
620 | hibernate_nvs_restore(); | 620 | hibernate_nvs_restore(); |
621 | /* Allow EC transactions to happen. */ | 621 | /* Allow EC transactions to happen. */ |
622 | acpi_ec_resume_transactions_early(); | 622 | acpi_ec_unblock_transactions_early(); |
623 | } | 623 | } |
624 | 624 | ||
625 | static void acpi_pm_thaw(void) | 625 | static void acpi_pm_thaw(void) |
626 | { | 626 | { |
627 | acpi_ec_resume_transactions(); | 627 | acpi_ec_unblock_transactions(); |
628 | acpi_enable_all_runtime_gpes(); | 628 | acpi_enable_all_runtime_gpes(); |
629 | } | 629 | } |
630 | 630 | ||