diff options
Diffstat (limited to 'drivers/acpi/events/evmisc.c')
-rw-r--r-- | drivers/acpi/events/evmisc.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c index 82c457fa5a1f..dbac5b3248a0 100644 --- a/drivers/acpi/events/evmisc.c +++ b/drivers/acpi/events/evmisc.c | |||
@@ -148,7 +148,9 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node, | |||
148 | break; | 148 | break; |
149 | 149 | ||
150 | default: | 150 | default: |
151 | |||
151 | /* All other types are not supported */ | 152 | /* All other types are not supported */ |
153 | |||
152 | return (AE_TYPE); | 154 | return (AE_TYPE); |
153 | } | 155 | } |
154 | } | 156 | } |
@@ -189,9 +191,8 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node, | |||
189 | acpi_ut_delete_generic_state(notify_info); | 191 | acpi_ut_delete_generic_state(notify_info); |
190 | } | 192 | } |
191 | } else { | 193 | } else { |
192 | /* | 194 | /* There is no notify handler (per-device or system) for this device */ |
193 | * There is no notify handler (per-device or system) for this device. | 195 | |
194 | */ | ||
195 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 196 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
196 | "No notify handler for Notify (%4.4s, %X) node %p\n", | 197 | "No notify handler for Notify (%4.4s, %X) node %p\n", |
197 | acpi_ut_get_node_name(node), notify_value, | 198 | acpi_ut_get_node_name(node), notify_value, |
@@ -225,9 +226,8 @@ static void ACPI_SYSTEM_XFACE acpi_ev_notify_dispatch(void *context) | |||
225 | ACPI_FUNCTION_ENTRY(); | 226 | ACPI_FUNCTION_ENTRY(); |
226 | 227 | ||
227 | /* | 228 | /* |
228 | * We will invoke a global notify handler if installed. | 229 | * We will invoke a global notify handler if installed. This is done |
229 | * This is done _before_ we invoke the per-device handler attached | 230 | * _before_ we invoke the per-device handler attached to the device. |
230 | * to the device. | ||
231 | */ | 231 | */ |
232 | if (notify_info->notify.value <= ACPI_MAX_SYS_NOTIFY) { | 232 | if (notify_info->notify.value <= ACPI_MAX_SYS_NOTIFY) { |
233 | 233 | ||
@@ -339,11 +339,10 @@ acpi_status acpi_ev_init_global_lock_handler(void) | |||
339 | NULL); | 339 | NULL); |
340 | 340 | ||
341 | /* | 341 | /* |
342 | * If the global lock does not exist on this platform, the attempt | 342 | * If the global lock does not exist on this platform, the attempt to |
343 | * to enable GBL_STATUS will fail (the GBL_ENABLE bit will not stick) | 343 | * enable GBL_STATUS will fail (the GBL_ENABLE bit will not stick). |
344 | * Map to AE_OK, but mark global lock as not present. | 344 | * Map to AE_OK, but mark global lock as not present. Any attempt to |
345 | * Any attempt to actually use the global lock will be flagged | 345 | * actually use the global lock will be flagged with an error. |
346 | * with an error. | ||
347 | */ | 346 | */ |
348 | if (status == AE_NO_HARDWARE_RESPONSE) { | 347 | if (status == AE_NO_HARDWARE_RESPONSE) { |
349 | ACPI_ERROR((AE_INFO, | 348 | ACPI_ERROR((AE_INFO, |
@@ -452,8 +451,8 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout) | |||
452 | } | 451 | } |
453 | 452 | ||
454 | /* | 453 | /* |
455 | * Make sure that a global lock actually exists. If not, just treat | 454 | * Make sure that a global lock actually exists. If not, just treat the |
456 | * the lock as a standard mutex. | 455 | * lock as a standard mutex. |
457 | */ | 456 | */ |
458 | if (!acpi_gbl_global_lock_present) { | 457 | if (!acpi_gbl_global_lock_present) { |
459 | acpi_gbl_global_lock_acquired = TRUE; | 458 | acpi_gbl_global_lock_acquired = TRUE; |
@@ -572,8 +571,8 @@ void acpi_ev_terminate(void) | |||
572 | 571 | ||
573 | if (acpi_gbl_events_initialized) { | 572 | if (acpi_gbl_events_initialized) { |
574 | /* | 573 | /* |
575 | * Disable all event-related functionality. | 574 | * Disable all event-related functionality. In all cases, on error, |
576 | * In all cases, on error, print a message but obviously we don't abort. | 575 | * print a message but obviously we don't abort. |
577 | */ | 576 | */ |
578 | 577 | ||
579 | /* Disable all fixed events */ | 578 | /* Disable all fixed events */ |