diff options
Diffstat (limited to 'drivers/acpi/executer/exconfig.c')
| -rw-r--r-- | drivers/acpi/executer/exconfig.c | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c index ac3c061967f2..734b2f24af48 100644 --- a/drivers/acpi/executer/exconfig.c +++ b/drivers/acpi/executer/exconfig.c | |||
| @@ -54,6 +54,14 @@ | |||
| 54 | #define _COMPONENT ACPI_EXECUTER | 54 | #define _COMPONENT ACPI_EXECUTER |
| 55 | ACPI_MODULE_NAME ("exconfig") | 55 | ACPI_MODULE_NAME ("exconfig") |
| 56 | 56 | ||
| 57 | /* Local prototypes */ | ||
| 58 | |||
| 59 | static acpi_status | ||
| 60 | acpi_ex_add_table ( | ||
| 61 | struct acpi_table_header *table, | ||
| 62 | struct acpi_namespace_node *parent_node, | ||
| 63 | union acpi_operand_object **ddb_handle); | ||
| 64 | |||
| 57 | 65 | ||
| 58 | /******************************************************************************* | 66 | /******************************************************************************* |
| 59 | * | 67 | * |
| @@ -70,7 +78,7 @@ | |||
| 70 | * | 78 | * |
| 71 | ******************************************************************************/ | 79 | ******************************************************************************/ |
| 72 | 80 | ||
| 73 | acpi_status | 81 | static acpi_status |
| 74 | acpi_ex_add_table ( | 82 | acpi_ex_add_table ( |
| 75 | struct acpi_table_header *table, | 83 | struct acpi_table_header *table, |
| 76 | struct acpi_namespace_node *parent_node, | 84 | struct acpi_namespace_node *parent_node, |
| @@ -95,10 +103,10 @@ acpi_ex_add_table ( | |||
| 95 | 103 | ||
| 96 | ACPI_MEMSET (&table_info, 0, sizeof (struct acpi_table_desc)); | 104 | ACPI_MEMSET (&table_info, 0, sizeof (struct acpi_table_desc)); |
| 97 | 105 | ||
| 98 | table_info.type = ACPI_TABLE_SSDT; | 106 | table_info.type = ACPI_TABLE_SSDT; |
| 99 | table_info.pointer = table; | 107 | table_info.pointer = table; |
| 100 | table_info.length = (acpi_size) table->length; | 108 | table_info.length = (acpi_size) table->length; |
| 101 | table_info.allocation = ACPI_MEM_ALLOCATED; | 109 | table_info.allocation = ACPI_MEM_ALLOCATED; |
| 102 | 110 | ||
| 103 | status = acpi_tb_install_table (&table_info); | 111 | status = acpi_tb_install_table (&table_info); |
| 104 | if (ACPI_FAILURE (status)) { | 112 | if (ACPI_FAILURE (status)) { |
| @@ -226,11 +234,10 @@ acpi_ex_load_table_op ( | |||
| 226 | start_node = parent_node; | 234 | start_node = parent_node; |
| 227 | } | 235 | } |
| 228 | 236 | ||
| 229 | /* | 237 | /* Find the node referenced by the parameter_path_string */ |
| 230 | * Find the node referenced by the parameter_path_string | 238 | |
| 231 | */ | ||
| 232 | status = acpi_ns_get_node_by_path (operand[4]->string.pointer, start_node, | 239 | status = acpi_ns_get_node_by_path (operand[4]->string.pointer, start_node, |
| 233 | ACPI_NS_SEARCH_PARENT, ¶meter_node); | 240 | ACPI_NS_SEARCH_PARENT, ¶meter_node); |
| 234 | if (ACPI_FAILURE (status)) { | 241 | if (ACPI_FAILURE (status)) { |
| 235 | return_ACPI_STATUS (status); | 242 | return_ACPI_STATUS (status); |
| 236 | } | 243 | } |
| @@ -248,7 +255,8 @@ acpi_ex_load_table_op ( | |||
| 248 | if (parameter_node) { | 255 | if (parameter_node) { |
| 249 | /* Store the parameter data into the optional parameter object */ | 256 | /* Store the parameter data into the optional parameter object */ |
| 250 | 257 | ||
| 251 | status = acpi_ex_store (operand[5], ACPI_CAST_PTR (union acpi_operand_object, parameter_node), | 258 | status = acpi_ex_store (operand[5], |
| 259 | ACPI_CAST_PTR (union acpi_operand_object, parameter_node), | ||
| 252 | walk_state); | 260 | walk_state); |
| 253 | if (ACPI_FAILURE (status)) { | 261 | if (ACPI_FAILURE (status)) { |
| 254 | (void) acpi_ex_unload_table (ddb_handle); | 262 | (void) acpi_ex_unload_table (ddb_handle); |
| @@ -371,7 +379,8 @@ acpi_ex_load_op ( | |||
| 371 | goto cleanup; | 379 | goto cleanup; |
| 372 | } | 380 | } |
| 373 | 381 | ||
| 374 | table_ptr = ACPI_CAST_PTR (struct acpi_table_header, buffer_desc->buffer.pointer); | 382 | table_ptr = ACPI_CAST_PTR (struct acpi_table_header, |
| 383 | buffer_desc->buffer.pointer); | ||
| 375 | 384 | ||
| 376 | /* Sanity check the table length */ | 385 | /* Sanity check the table length */ |
| 377 | 386 | ||
