diff options
author | Len Brown <len.brown@intel.com> | 2007-05-09 23:34:35 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-05-09 23:34:35 -0400 |
commit | fd3509436fde38d4c854bf5a6b83d2c779904f8e (patch) | |
tree | af3ffbe044021f6781982d14ae0b7b8aafd4b89b /drivers/acpi/events | |
parent | 88db5e1489f23876a226f5393fd978ddc09dc5f9 (diff) |
ACPICA: Lindent
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/events')
-rw-r--r-- | drivers/acpi/events/evgpe.c | 5 | ||||
-rw-r--r-- | drivers/acpi/events/evgpeblk.c | 3 | ||||
-rw-r--r-- | drivers/acpi/events/evmisc.c | 9 | ||||
-rw-r--r-- | drivers/acpi/events/evrgnini.c | 3 | ||||
-rw-r--r-- | drivers/acpi/events/evxface.c | 1 | ||||
-rw-r--r-- | drivers/acpi/events/evxfevnt.c | 2 |
6 files changed, 11 insertions, 12 deletions
diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c index 635ba449ebc2..e22f4a973c0f 100644 --- a/drivers/acpi/events/evgpe.c +++ b/drivers/acpi/events/evgpe.c | |||
@@ -341,9 +341,8 @@ struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device, | |||
341 | 341 | ||
342 | /* A Non-NULL gpe_device means this is a GPE Block Device */ | 342 | /* A Non-NULL gpe_device means this is a GPE Block Device */ |
343 | 343 | ||
344 | obj_desc = | 344 | obj_desc = acpi_ns_get_attached_object((struct acpi_namespace_node *) |
345 | acpi_ns_get_attached_object((struct acpi_namespace_node *) | 345 | gpe_device); |
346 | gpe_device); | ||
347 | if (!obj_desc || !obj_desc->device.gpe_block) { | 346 | if (!obj_desc || !obj_desc->device.gpe_block) { |
348 | return (NULL); | 347 | return (NULL); |
349 | } | 348 | } |
diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c index ad5bc76edf46..902c287b3a4f 100644 --- a/drivers/acpi/events/evgpeblk.c +++ b/drivers/acpi/events/evgpeblk.c | |||
@@ -1033,8 +1033,7 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device, | |||
1033 | 1033 | ||
1034 | if (((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) == | 1034 | if (((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) == |
1035 | ACPI_GPE_DISPATCH_METHOD) | 1035 | ACPI_GPE_DISPATCH_METHOD) |
1036 | && (gpe_event_info-> | 1036 | && (gpe_event_info->flags & ACPI_GPE_TYPE_RUNTIME)) { |
1037 | flags & ACPI_GPE_TYPE_RUNTIME)) { | ||
1038 | gpe_enabled_count++; | 1037 | gpe_enabled_count++; |
1039 | } | 1038 | } |
1040 | 1039 | ||
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c index ad447b1d97a3..21cb749d0c75 100644 --- a/drivers/acpi/events/evmisc.c +++ b/drivers/acpi/events/evmisc.c | |||
@@ -320,8 +320,9 @@ static u32 acpi_ev_global_lock_handler(void *context) | |||
320 | acpi_gbl_global_lock_acquired = TRUE; | 320 | acpi_gbl_global_lock_acquired = TRUE; |
321 | /* Send a unit to the semaphore */ | 321 | /* Send a unit to the semaphore */ |
322 | 322 | ||
323 | if (ACPI_FAILURE(acpi_os_signal_semaphore( | 323 | if (ACPI_FAILURE |
324 | acpi_gbl_global_lock_semaphore, 1))) { | 324 | (acpi_os_signal_semaphore |
325 | (acpi_gbl_global_lock_semaphore, 1))) { | ||
325 | ACPI_ERROR((AE_INFO, | 326 | ACPI_ERROR((AE_INFO, |
326 | "Could not signal Global Lock semaphore")); | 327 | "Could not signal Global Lock semaphore")); |
327 | } | 328 | } |
@@ -447,7 +448,9 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout) | |||
447 | } | 448 | } |
448 | 449 | ||
449 | if (ACPI_FAILURE(status)) { | 450 | if (ACPI_FAILURE(status)) { |
450 | status = acpi_ex_system_wait_mutex(acpi_gbl_global_lock_mutex, timeout); | 451 | status = |
452 | acpi_ex_system_wait_mutex(acpi_gbl_global_lock_mutex, | ||
453 | timeout); | ||
451 | } | 454 | } |
452 | if (ACPI_FAILURE(status)) { | 455 | if (ACPI_FAILURE(status)) { |
453 | return_ACPI_STATUS(status); | 456 | return_ACPI_STATUS(status); |
diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c index a4fa7e6822a3..400d90fca966 100644 --- a/drivers/acpi/events/evrgnini.c +++ b/drivers/acpi/events/evrgnini.c | |||
@@ -228,7 +228,8 @@ acpi_ev_pci_config_region_setup(acpi_handle handle, | |||
228 | 228 | ||
229 | /* Install a handler for this PCI root bridge */ | 229 | /* Install a handler for this PCI root bridge */ |
230 | 230 | ||
231 | status = acpi_install_address_space_handler((acpi_handle) pci_root_node, ACPI_ADR_SPACE_PCI_CONFIG, ACPI_DEFAULT_HANDLER, NULL, NULL); | 231 | status = |
232 | acpi_install_address_space_handler((acpi_handle) pci_root_node, ACPI_ADR_SPACE_PCI_CONFIG, ACPI_DEFAULT_HANDLER, NULL, NULL); | ||
232 | if (ACPI_FAILURE(status)) { | 233 | if (ACPI_FAILURE(status)) { |
233 | if (status == AE_SAME_HANDLER) { | 234 | if (status == AE_SAME_HANDLER) { |
234 | /* | 235 | /* |
diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c index 685a103a3587..6d866a01f5f4 100644 --- a/drivers/acpi/events/evxface.c +++ b/drivers/acpi/events/evxface.c | |||
@@ -91,7 +91,6 @@ acpi_status acpi_install_exception_handler(acpi_exception_handler handler) | |||
91 | 91 | ||
92 | ACPI_EXPORT_SYMBOL(acpi_install_exception_handler) | 92 | ACPI_EXPORT_SYMBOL(acpi_install_exception_handler) |
93 | #endif /* ACPI_FUTURE_USAGE */ | 93 | #endif /* ACPI_FUTURE_USAGE */ |
94 | |||
95 | /******************************************************************************* | 94 | /******************************************************************************* |
96 | * | 95 | * |
97 | * FUNCTION: acpi_install_fixed_event_handler | 96 | * FUNCTION: acpi_install_fixed_event_handler |
diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c index 17065e98807c..9cbd3414a574 100644 --- a/drivers/acpi/events/evxfevnt.c +++ b/drivers/acpi/events/evxfevnt.c | |||
@@ -472,7 +472,6 @@ acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags) | |||
472 | } | 472 | } |
473 | 473 | ||
474 | ACPI_EXPORT_SYMBOL(acpi_clear_gpe) | 474 | ACPI_EXPORT_SYMBOL(acpi_clear_gpe) |
475 | |||
476 | #ifdef ACPI_FUTURE_USAGE | 475 | #ifdef ACPI_FUTURE_USAGE |
477 | /******************************************************************************* | 476 | /******************************************************************************* |
478 | * | 477 | * |
@@ -568,7 +567,6 @@ acpi_get_gpe_status(acpi_handle gpe_device, | |||
568 | 567 | ||
569 | ACPI_EXPORT_SYMBOL(acpi_get_gpe_status) | 568 | ACPI_EXPORT_SYMBOL(acpi_get_gpe_status) |
570 | #endif /* ACPI_FUTURE_USAGE */ | 569 | #endif /* ACPI_FUTURE_USAGE */ |
571 | |||
572 | /******************************************************************************* | 570 | /******************************************************************************* |
573 | * | 571 | * |
574 | * FUNCTION: acpi_install_gpe_block | 572 | * FUNCTION: acpi_install_gpe_block |