diff options
Diffstat (limited to 'drivers/acpi/events/evmisc.c')
-rw-r--r-- | drivers/acpi/events/evmisc.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c index 24e0b8d36f31..6eef4efddcf6 100644 --- a/drivers/acpi/events/evmisc.c +++ b/drivers/acpi/events/evmisc.c | |||
@@ -49,12 +49,13 @@ | |||
49 | #define _COMPONENT ACPI_EVENTS | 49 | #define _COMPONENT ACPI_EVENTS |
50 | ACPI_MODULE_NAME("evmisc") | 50 | ACPI_MODULE_NAME("evmisc") |
51 | 51 | ||
52 | /* Names for Notify() values, used for debug output */ | ||
52 | #ifdef ACPI_DEBUG_OUTPUT | 53 | #ifdef ACPI_DEBUG_OUTPUT |
53 | static const char *acpi_notify_value_names[] = { | 54 | static const char *acpi_notify_value_names[] = { |
54 | "Bus Check", | 55 | "Bus Check", |
55 | "Device Check", | 56 | "Device Check", |
56 | "Device Wake", | 57 | "Device Wake", |
57 | "Eject request", | 58 | "Eject Request", |
58 | "Device Check Light", | 59 | "Device Check Light", |
59 | "Frequency Mismatch", | 60 | "Frequency Mismatch", |
60 | "Bus Mode Mismatch", | 61 | "Bus Mode Mismatch", |
@@ -191,8 +192,9 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node, | |||
191 | notify_info->notify.value = (u16) notify_value; | 192 | notify_info->notify.value = (u16) notify_value; |
192 | notify_info->notify.handler_obj = handler_obj; | 193 | notify_info->notify.handler_obj = handler_obj; |
193 | 194 | ||
194 | status = acpi_os_execute(OSL_NOTIFY_HANDLER, | 195 | status = |
195 | acpi_ev_notify_dispatch, notify_info); | 196 | acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_ev_notify_dispatch, |
197 | notify_info); | ||
196 | if (ACPI_FAILURE(status)) { | 198 | if (ACPI_FAILURE(status)) { |
197 | acpi_ut_delete_generic_state(notify_info); | 199 | acpi_ut_delete_generic_state(notify_info); |
198 | } | 200 | } |
@@ -345,8 +347,9 @@ static u32 acpi_ev_global_lock_handler(void *context) | |||
345 | 347 | ||
346 | /* Run the Global Lock thread which will signal all waiting threads */ | 348 | /* Run the Global Lock thread which will signal all waiting threads */ |
347 | 349 | ||
348 | status = acpi_os_execute(OSL_GLOBAL_LOCK_HANDLER, | 350 | status = |
349 | acpi_ev_global_lock_thread, context); | 351 | acpi_os_execute(OSL_GLOBAL_LOCK_HANDLER, |
352 | acpi_ev_global_lock_thread, context); | ||
350 | if (ACPI_FAILURE(status)) { | 353 | if (ACPI_FAILURE(status)) { |
351 | ACPI_EXCEPTION((AE_INFO, status, | 354 | ACPI_EXCEPTION((AE_INFO, status, |
352 | "Could not queue Global Lock thread")); | 355 | "Could not queue Global Lock thread")); |
@@ -462,8 +465,9 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout) | |||
462 | * Acquire the global lock semaphore first. | 465 | * Acquire the global lock semaphore first. |
463 | * Since this wait will block, we must release the interpreter | 466 | * Since this wait will block, we must release the interpreter |
464 | */ | 467 | */ |
465 | status = acpi_ex_system_wait_semaphore(acpi_gbl_global_lock_semaphore, | 468 | status = |
466 | timeout); | 469 | acpi_ex_system_wait_semaphore(acpi_gbl_global_lock_semaphore, |
470 | timeout); | ||
467 | return_ACPI_STATUS(status); | 471 | return_ACPI_STATUS(status); |
468 | } | 472 | } |
469 | 473 | ||