aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/acpica/evxface.c4
-rw-r--r--drivers/acpi/osl.c4
-rw-r--r--drivers/acpi/sleep.c2
-rw-r--r--include/acpi/acpiosxf.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c
index 90ae6d193645..6a8b53789be4 100644
--- a/drivers/acpi/acpica/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -251,7 +251,7 @@ acpi_remove_notify_handler(acpi_handle device,
251 } 251 }
252 /* Make sure all deferred tasks are completed */ 252 /* Make sure all deferred tasks are completed */
253 253
254 acpi_os_wait_events_complete(NULL); 254 acpi_os_wait_events_complete();
255 255
256 status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE); 256 status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
257 if (ACPI_FAILURE(status)) { 257 if (ACPI_FAILURE(status)) {
@@ -699,7 +699,7 @@ acpi_remove_gpe_handler(acpi_handle gpe_device,
699 699
700 /* Make sure all deferred tasks are completed */ 700 /* Make sure all deferred tasks are completed */
701 701
702 acpi_os_wait_events_complete(NULL); 702 acpi_os_wait_events_complete();
703 703
704 status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS); 704 status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
705 if (ACPI_FAILURE(status)) { 705 if (ACPI_FAILURE(status)) {
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index c3881b2eb8b2..9eaf708f5885 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -891,7 +891,7 @@ static void acpi_os_execute_deferred(struct work_struct *work)
891 struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work); 891 struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work);
892 892
893 if (dpc->wait) 893 if (dpc->wait)
894 acpi_os_wait_events_complete(NULL); 894 acpi_os_wait_events_complete();
895 895
896 dpc->function(dpc->context); 896 dpc->function(dpc->context);
897 kfree(dpc); 897 kfree(dpc);
@@ -987,7 +987,7 @@ acpi_status acpi_os_hotplug_execute(acpi_osd_exec_callback function,
987 return __acpi_os_execute(0, function, context, 1); 987 return __acpi_os_execute(0, function, context, 1);
988} 988}
989 989
990void acpi_os_wait_events_complete(void *context) 990void acpi_os_wait_events_complete(void)
991{ 991{
992 flush_workqueue(kacpid_wq); 992 flush_workqueue(kacpid_wq);
993 flush_workqueue(kacpi_notify_wq); 993 flush_workqueue(kacpi_notify_wq);
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index eb6fd233764b..9a14f90d98ec 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -144,7 +144,7 @@ void __init acpi_old_suspend_ordering(void)
144static int acpi_pm_freeze(void) 144static int acpi_pm_freeze(void)
145{ 145{
146 acpi_disable_all_gpes(); 146 acpi_disable_all_gpes();
147 acpi_os_wait_events_complete(NULL); 147 acpi_os_wait_events_complete();
148 acpi_ec_block_transactions(); 148 acpi_ec_block_transactions();
149 return 0; 149 return 0;
150} 150}
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 21a5548c6686..f3746f7e0f40 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -205,7 +205,7 @@ acpi_os_execute(acpi_execute_type type,
205acpi_status 205acpi_status
206acpi_os_hotplug_execute(acpi_osd_exec_callback function, void *context); 206acpi_os_hotplug_execute(acpi_osd_exec_callback function, void *context);
207 207
208void acpi_os_wait_events_complete(void *context); 208void acpi_os_wait_events_complete(void);
209 209
210void acpi_os_sleep(u64 milliseconds); 210void acpi_os_sleep(u64 milliseconds);
211 211