diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /drivers/acpi/acpica/dsopcode.c | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'drivers/acpi/acpica/dsopcode.c')
-rw-r--r-- | drivers/acpi/acpica/dsopcode.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c index d09c6b4bab2..c627a288e02 100644 --- a/drivers/acpi/acpica/dsopcode.c +++ b/drivers/acpi/acpica/dsopcode.c | |||
@@ -1,11 +1,11 @@ | |||
1 | /****************************************************************************** | 1 | /****************************************************************************** |
2 | * | 2 | * |
3 | * Module Name: dsopcode - Dispatcher support for regions and fields | 3 | * Module Name: dsopcode - Dispatcher suport for regions and fields |
4 | * | 4 | * |
5 | *****************************************************************************/ | 5 | *****************************************************************************/ |
6 | 6 | ||
7 | /* | 7 | /* |
8 | * Copyright (C) 2000 - 2012, Intel Corp. | 8 | * Copyright (C) 2000 - 2011, Intel Corp. |
9 | * All rights reserved. | 9 | * All rights reserved. |
10 | * | 10 | * |
11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without |
@@ -286,7 +286,7 @@ acpi_ds_init_buffer_field(u16 aml_opcode, | |||
286 | * FUNCTION: acpi_ds_eval_buffer_field_operands | 286 | * FUNCTION: acpi_ds_eval_buffer_field_operands |
287 | * | 287 | * |
288 | * PARAMETERS: walk_state - Current walk | 288 | * PARAMETERS: walk_state - Current walk |
289 | * op - A valid buffer_field Op object | 289 | * Op - A valid buffer_field Op object |
290 | * | 290 | * |
291 | * RETURN: Status | 291 | * RETURN: Status |
292 | * | 292 | * |
@@ -370,7 +370,7 @@ acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state, | |||
370 | * FUNCTION: acpi_ds_eval_region_operands | 370 | * FUNCTION: acpi_ds_eval_region_operands |
371 | * | 371 | * |
372 | * PARAMETERS: walk_state - Current walk | 372 | * PARAMETERS: walk_state - Current walk |
373 | * op - A valid region Op object | 373 | * Op - A valid region Op object |
374 | * | 374 | * |
375 | * RETURN: Status | 375 | * RETURN: Status |
376 | * | 376 | * |
@@ -397,7 +397,7 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state, | |||
397 | */ | 397 | */ |
398 | node = op->common.node; | 398 | node = op->common.node; |
399 | 399 | ||
400 | /* next_op points to the op that holds the space_ID */ | 400 | /* next_op points to the op that holds the space_iD */ |
401 | 401 | ||
402 | next_op = op->common.value.arg; | 402 | next_op = op->common.value.arg; |
403 | 403 | ||
@@ -461,7 +461,7 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state, | |||
461 | * FUNCTION: acpi_ds_eval_table_region_operands | 461 | * FUNCTION: acpi_ds_eval_table_region_operands |
462 | * | 462 | * |
463 | * PARAMETERS: walk_state - Current walk | 463 | * PARAMETERS: walk_state - Current walk |
464 | * op - A valid region Op object | 464 | * Op - A valid region Op object |
465 | * | 465 | * |
466 | * RETURN: Status | 466 | * RETURN: Status |
467 | * | 467 | * |
@@ -560,7 +560,7 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state, | |||
560 | * FUNCTION: acpi_ds_eval_data_object_operands | 560 | * FUNCTION: acpi_ds_eval_data_object_operands |
561 | * | 561 | * |
562 | * PARAMETERS: walk_state - Current walk | 562 | * PARAMETERS: walk_state - Current walk |
563 | * op - A valid data_object Op object | 563 | * Op - A valid data_object Op object |
564 | * obj_desc - data_object | 564 | * obj_desc - data_object |
565 | * | 565 | * |
566 | * RETURN: Status | 566 | * RETURN: Status |
@@ -649,8 +649,7 @@ acpi_ds_eval_data_object_operands(struct acpi_walk_state *walk_state, | |||
649 | ((op->common.parent->common.aml_opcode != AML_PACKAGE_OP) && | 649 | ((op->common.parent->common.aml_opcode != AML_PACKAGE_OP) && |
650 | (op->common.parent->common.aml_opcode != | 650 | (op->common.parent->common.aml_opcode != |
651 | AML_VAR_PACKAGE_OP) | 651 | AML_VAR_PACKAGE_OP) |
652 | && (op->common.parent->common.aml_opcode != | 652 | && (op->common.parent->common.aml_opcode != AML_NAME_OP))) { |
653 | AML_NAME_OP))) { | ||
654 | walk_state->result_obj = obj_desc; | 653 | walk_state->result_obj = obj_desc; |
655 | } | 654 | } |
656 | } | 655 | } |
@@ -663,7 +662,7 @@ acpi_ds_eval_data_object_operands(struct acpi_walk_state *walk_state, | |||
663 | * FUNCTION: acpi_ds_eval_bank_field_operands | 662 | * FUNCTION: acpi_ds_eval_bank_field_operands |
664 | * | 663 | * |
665 | * PARAMETERS: walk_state - Current walk | 664 | * PARAMETERS: walk_state - Current walk |
666 | * op - A valid bank_field Op object | 665 | * Op - A valid bank_field Op object |
667 | * | 666 | * |
668 | * RETURN: Status | 667 | * RETURN: Status |
669 | * | 668 | * |