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/resources | |
| parent | 88db5e1489f23876a226f5393fd978ddc09dc5f9 (diff) | |
ACPICA: Lindent
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/resources')
| -rw-r--r-- | drivers/acpi/resources/rscalc.c | 3 | ||||
| -rw-r--r-- | drivers/acpi/resources/rscreate.c | 13 | ||||
| -rw-r--r-- | drivers/acpi/resources/rsdump.c | 8 | ||||
| -rw-r--r-- | drivers/acpi/resources/rsinfo.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/resources/rslist.c | 7 | ||||
| -rw-r--r-- | drivers/acpi/resources/rsmisc.c | 4 | ||||
| -rw-r--r-- | drivers/acpi/resources/rsutils.c | 6 | ||||
| -rw-r--r-- | drivers/acpi/resources/rsxface.c | 3 |
8 files changed, 20 insertions, 26 deletions
diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c index 8c6d3fdec38a..0dd2ce8a3475 100644 --- a/drivers/acpi/resources/rscalc.c +++ b/drivers/acpi/resources/rscalc.c | |||
| @@ -567,7 +567,8 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object, | |||
| 567 | (*sub_object_list)->string. | 567 | (*sub_object_list)->string. |
| 568 | length + 1); | 568 | length + 1); |
| 569 | } else { | 569 | } else { |
| 570 | temp_size_needed += acpi_ns_get_pathname_length((*sub_object_list)->reference.node); | 570 | temp_size_needed += |
| 571 | acpi_ns_get_pathname_length((*sub_object_list)->reference.node); | ||
| 571 | } | 572 | } |
| 572 | } else { | 573 | } else { |
| 573 | /* | 574 | /* |
diff --git a/drivers/acpi/resources/rscreate.c b/drivers/acpi/resources/rscreate.c index cc48ab05676c..50da494c3ee2 100644 --- a/drivers/acpi/resources/rscreate.c +++ b/drivers/acpi/resources/rscreate.c | |||
| @@ -267,16 +267,19 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object, | |||
| 267 | * If BIOS erroneously reversed the _PRT source_name and source_index, | 267 | * If BIOS erroneously reversed the _PRT source_name and source_index, |
| 268 | * then reverse them back. | 268 | * then reverse them back. |
| 269 | */ | 269 | */ |
| 270 | if (ACPI_GET_OBJECT_TYPE (sub_object_list[3]) != ACPI_TYPE_INTEGER) { | 270 | if (ACPI_GET_OBJECT_TYPE(sub_object_list[3]) != |
| 271 | ACPI_TYPE_INTEGER) { | ||
| 271 | if (acpi_gbl_enable_interpreter_slack) { | 272 | if (acpi_gbl_enable_interpreter_slack) { |
| 272 | source_name_index = 3; | 273 | source_name_index = 3; |
| 273 | source_index_index = 2; | 274 | source_index_index = 2; |
| 274 | printk(KERN_WARNING "ACPI: Handling Garbled _PRT entry\n"); | 275 | printk(KERN_WARNING |
| 276 | "ACPI: Handling Garbled _PRT entry\n"); | ||
| 275 | } else { | 277 | } else { |
| 276 | ACPI_ERROR((AE_INFO, | 278 | ACPI_ERROR((AE_INFO, |
| 277 | "(PRT[%X].source_index) Need Integer, found %s", | 279 | "(PRT[%X].source_index) Need Integer, found %s", |
| 278 | index, | 280 | index, |
| 279 | acpi_ut_get_object_type_name(sub_object_list[3]))); | 281 | acpi_ut_get_object_type_name |
| 282 | (sub_object_list[3]))); | ||
| 280 | return_ACPI_STATUS(AE_BAD_DATA); | 283 | return_ACPI_STATUS(AE_BAD_DATA); |
| 281 | } | 284 | } |
| 282 | } | 285 | } |
diff --git a/drivers/acpi/resources/rsdump.c b/drivers/acpi/resources/rsdump.c index de20a5d6decf..46da116a4030 100644 --- a/drivers/acpi/resources/rsdump.c +++ b/drivers/acpi/resources/rsdump.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | 46 | ||
| 47 | #define _COMPONENT ACPI_RESOURCES | 47 | #define _COMPONENT ACPI_RESOURCES |
| 48 | ACPI_MODULE_NAME("rsdump") | 48 | ACPI_MODULE_NAME("rsdump") |
| 49 | |||
| 50 | #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) | 49 | #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) |
| 51 | /* Local prototypes */ | 50 | /* Local prototypes */ |
| 52 | static void acpi_rs_out_string(char *title, char *value); | 51 | static void acpi_rs_out_string(char *title, char *value); |
| @@ -489,10 +488,9 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table) | |||
| 489 | /* | 488 | /* |
| 490 | * Optional resource_source for Address resources | 489 | * Optional resource_source for Address resources |
| 491 | */ | 490 | */ |
| 492 | acpi_rs_dump_resource_source(ACPI_CAST_PTR | 491 | acpi_rs_dump_resource_source(ACPI_CAST_PTR(struct |
| 493 | (struct | 492 | acpi_resource_source, |
| 494 | acpi_resource_source, | 493 | target)); |
| 495 | target)); | ||
| 496 | break; | 494 | break; |
| 497 | 495 | ||
| 498 | default: | 496 | default: |
diff --git a/drivers/acpi/resources/rsinfo.c b/drivers/acpi/resources/rsinfo.c index 7e3c335ab320..2c2adb6292c1 100644 --- a/drivers/acpi/resources/rsinfo.c +++ b/drivers/acpi/resources/rsinfo.c | |||
| @@ -142,7 +142,7 @@ struct acpi_rsdump_info *acpi_gbl_dump_resource_dispatch[] = { | |||
| 142 | }; | 142 | }; |
| 143 | #endif | 143 | #endif |
| 144 | 144 | ||
| 145 | #endif /* ACPI_FUTURE_USAGE */ | 145 | #endif /* ACPI_FUTURE_USAGE */ |
| 146 | /* | 146 | /* |
| 147 | * Base sizes for external AML resource descriptors, indexed by internal type. | 147 | * Base sizes for external AML resource descriptors, indexed by internal type. |
| 148 | * Includes size of the descriptor header (1 byte for small descriptors, | 148 | * Includes size of the descriptor header (1 byte for small descriptors, |
diff --git a/drivers/acpi/resources/rslist.c b/drivers/acpi/resources/rslist.c index a92755c8877d..ca21e4660c79 100644 --- a/drivers/acpi/resources/rslist.c +++ b/drivers/acpi/resources/rslist.c | |||
| @@ -153,10 +153,9 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource, | |||
| 153 | 153 | ||
| 154 | /* Perform the conversion */ | 154 | /* Perform the conversion */ |
| 155 | 155 | ||
| 156 | status = acpi_rs_convert_resource_to_aml(resource, | 156 | status = acpi_rs_convert_resource_to_aml(resource, ACPI_CAST_PTR(union |
| 157 | ACPI_CAST_PTR(union | 157 | aml_resource, |
| 158 | aml_resource, | 158 | aml), |
| 159 | aml), | ||
| 160 | acpi_gbl_set_resource_dispatch | 159 | acpi_gbl_set_resource_dispatch |
| 161 | [resource->type]); | 160 | [resource->type]); |
| 162 | if (ACPI_FAILURE(status)) { | 161 | if (ACPI_FAILURE(status)) { |
diff --git a/drivers/acpi/resources/rsmisc.c b/drivers/acpi/resources/rsmisc.c index 3b63b561b94e..c7081afa893a 100644 --- a/drivers/acpi/resources/rsmisc.c +++ b/drivers/acpi/resources/rsmisc.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | 46 | ||
| 47 | #define _COMPONENT ACPI_RESOURCES | 47 | #define _COMPONENT ACPI_RESOURCES |
| 48 | ACPI_MODULE_NAME("rsmisc") | 48 | ACPI_MODULE_NAME("rsmisc") |
| 49 | |||
| 50 | #define INIT_RESOURCE_TYPE(i) i->resource_offset | 49 | #define INIT_RESOURCE_TYPE(i) i->resource_offset |
| 51 | #define INIT_RESOURCE_LENGTH(i) i->aml_offset | 50 | #define INIT_RESOURCE_LENGTH(i) i->aml_offset |
| 52 | #define INIT_TABLE_LENGTH(i) i->value | 51 | #define INIT_TABLE_LENGTH(i) i->value |
| @@ -429,8 +428,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource, | |||
| 429 | * Optional resource_source (Index and String) | 428 | * Optional resource_source (Index and String) |
| 430 | */ | 429 | */ |
| 431 | aml_length = | 430 | aml_length = |
| 432 | acpi_rs_set_resource_source(aml, | 431 | acpi_rs_set_resource_source(aml, (acpi_rs_length) |
| 433 | (acpi_rs_length) | ||
| 434 | aml_length, source); | 432 | aml_length, source); |
| 435 | acpi_rs_set_resource_length(aml_length, aml); | 433 | acpi_rs_set_resource_length(aml_length, aml); |
| 436 | break; | 434 | break; |
diff --git a/drivers/acpi/resources/rsutils.c b/drivers/acpi/resources/rsutils.c index 2442a8f8df57..11c0bd7b9cfd 100644 --- a/drivers/acpi/resources/rsutils.c +++ b/drivers/acpi/resources/rsutils.c | |||
| @@ -353,10 +353,8 @@ acpi_rs_get_resource_source(acpi_rs_length resource_length, | |||
| 353 | * | 353 | * |
| 354 | * Zero the entire area of the buffer. | 354 | * Zero the entire area of the buffer. |
| 355 | */ | 355 | */ |
| 356 | total_length = | 356 | total_length = (u32) |
| 357 | (u32) | 357 | ACPI_STRLEN(ACPI_CAST_PTR(char, &aml_resource_source[1])) + 1; |
| 358 | ACPI_STRLEN(ACPI_CAST_PTR(char, &aml_resource_source[1])) + | ||
| 359 | 1; | ||
| 360 | total_length = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(total_length); | 358 | total_length = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(total_length); |
| 361 | 359 | ||
| 362 | ACPI_MEMSET(resource_source->string_ptr, 0, total_length); | 360 | ACPI_MEMSET(resource_source->string_ptr, 0, total_length); |
diff --git a/drivers/acpi/resources/rsxface.c b/drivers/acpi/resources/rsxface.c index 991f8901498c..f63813a358c5 100644 --- a/drivers/acpi/resources/rsxface.c +++ b/drivers/acpi/resources/rsxface.c | |||
| @@ -217,7 +217,6 @@ acpi_get_current_resources(acpi_handle device_handle, | |||
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | ACPI_EXPORT_SYMBOL(acpi_get_current_resources) | 219 | ACPI_EXPORT_SYMBOL(acpi_get_current_resources) |
| 220 | |||
| 221 | #ifdef ACPI_FUTURE_USAGE | 220 | #ifdef ACPI_FUTURE_USAGE |
| 222 | /******************************************************************************* | 221 | /******************************************************************************* |
| 223 | * | 222 | * |
| @@ -261,7 +260,6 @@ acpi_get_possible_resources(acpi_handle device_handle, | |||
| 261 | 260 | ||
| 262 | ACPI_EXPORT_SYMBOL(acpi_get_possible_resources) | 261 | ACPI_EXPORT_SYMBOL(acpi_get_possible_resources) |
| 263 | #endif /* ACPI_FUTURE_USAGE */ | 262 | #endif /* ACPI_FUTURE_USAGE */ |
| 264 | |||
| 265 | /******************************************************************************* | 263 | /******************************************************************************* |
| 266 | * | 264 | * |
| 267 | * FUNCTION: acpi_set_current_resources | 265 | * FUNCTION: acpi_set_current_resources |
| @@ -496,7 +494,6 @@ ACPI_EXPORT_SYMBOL(acpi_rs_match_vendor_resource) | |||
| 496 | * each resource in the list. | 494 | * each resource in the list. |
| 497 | * | 495 | * |
| 498 | ******************************************************************************/ | 496 | ******************************************************************************/ |
| 499 | |||
| 500 | acpi_status | 497 | acpi_status |
| 501 | acpi_walk_resources(acpi_handle device_handle, | 498 | acpi_walk_resources(acpi_handle device_handle, |
| 502 | char *name, | 499 | char *name, |
