ACPI / EC / PM: Fix names of functions that block/unblock EC transactions
The names of the functions used for blocking/unblocking EC
transactions during suspend/hibernation suggest that the transactions
are suspended and resumed by them, while in fact they are disabled
and enabled. Rename the functions (and the flag used by them) to
better reflect what they really do.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 24741ac..504a55e 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -116,7 +116,7 @@
{
acpi_disable_all_gpes();
acpi_os_wait_events_complete(NULL);
- acpi_ec_suspend_transactions();
+ acpi_ec_block_transactions();
return 0;
}
@@ -279,7 +279,7 @@
*/
acpi_disable_all_gpes();
/* Allow EC transactions to happen. */
- acpi_ec_resume_transactions_early();
+ acpi_ec_unblock_transactions_early();
local_irq_restore(flags);
printk(KERN_DEBUG "Back to C!\n");
@@ -293,7 +293,7 @@
static void acpi_suspend_finish(void)
{
- acpi_ec_resume_transactions();
+ acpi_ec_unblock_transactions();
acpi_pm_finish();
}
@@ -597,7 +597,7 @@
static void acpi_hibernation_finish(void)
{
hibernate_nvs_free();
- acpi_ec_resume_transactions();
+ acpi_ec_unblock_transactions();
acpi_pm_finish();
}
@@ -619,12 +619,12 @@
/* Restore the NVS memory area */
hibernate_nvs_restore();
/* Allow EC transactions to happen. */
- acpi_ec_resume_transactions_early();
+ acpi_ec_unblock_transactions_early();
}
static void acpi_pm_thaw(void)
{
- acpi_ec_resume_transactions();
+ acpi_ec_unblock_transactions();
acpi_enable_all_runtime_gpes();
}