diff options
Diffstat (limited to 'drivers/acpi/parser/pswalk.c')
-rw-r--r-- | drivers/acpi/parser/pswalk.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/drivers/acpi/parser/pswalk.c b/drivers/acpi/parser/pswalk.c index 9d20cb2ceb51..08f2321b6ded 100644 --- a/drivers/acpi/parser/pswalk.c +++ b/drivers/acpi/parser/pswalk.c | |||
@@ -41,13 +41,11 @@ | |||
41 | * POSSIBILITY OF SUCH DAMAGES. | 41 | * POSSIBILITY OF SUCH DAMAGES. |
42 | */ | 42 | */ |
43 | 43 | ||
44 | |||
45 | #include <acpi/acpi.h> | 44 | #include <acpi/acpi.h> |
46 | #include <acpi/acparser.h> | 45 | #include <acpi/acparser.h> |
47 | 46 | ||
48 | #define _COMPONENT ACPI_PARSER | 47 | #define _COMPONENT ACPI_PARSER |
49 | ACPI_MODULE_NAME ("pswalk") | 48 | ACPI_MODULE_NAME("pswalk") |
50 | |||
51 | 49 | ||
52 | /******************************************************************************* | 50 | /******************************************************************************* |
53 | * | 51 | * |
@@ -60,18 +58,13 @@ | |||
60 | * DESCRIPTION: Delete a portion of or an entire parse tree. | 58 | * DESCRIPTION: Delete a portion of or an entire parse tree. |
61 | * | 59 | * |
62 | ******************************************************************************/ | 60 | ******************************************************************************/ |
63 | 61 | void acpi_ps_delete_parse_tree(union acpi_parse_object *subtree_root) | |
64 | void | ||
65 | acpi_ps_delete_parse_tree ( | ||
66 | union acpi_parse_object *subtree_root) | ||
67 | { | 62 | { |
68 | union acpi_parse_object *op = subtree_root; | 63 | union acpi_parse_object *op = subtree_root; |
69 | union acpi_parse_object *next = NULL; | 64 | union acpi_parse_object *next = NULL; |
70 | union acpi_parse_object *parent = NULL; | 65 | union acpi_parse_object *parent = NULL; |
71 | |||
72 | |||
73 | ACPI_FUNCTION_TRACE_PTR ("ps_delete_parse_tree", subtree_root); | ||
74 | 66 | ||
67 | ACPI_FUNCTION_TRACE_PTR("ps_delete_parse_tree", subtree_root); | ||
75 | 68 | ||
76 | /* Visit all nodes in the subtree */ | 69 | /* Visit all nodes in the subtree */ |
77 | 70 | ||
@@ -81,7 +74,7 @@ acpi_ps_delete_parse_tree ( | |||
81 | if (op != parent) { | 74 | if (op != parent) { |
82 | /* Look for an argument or child of the current op */ | 75 | /* Look for an argument or child of the current op */ |
83 | 76 | ||
84 | next = acpi_ps_get_arg (op, 0); | 77 | next = acpi_ps_get_arg(op, 0); |
85 | if (next) { | 78 | if (next) { |
86 | /* Still going downward in tree (Op is not completed yet) */ | 79 | /* Still going downward in tree (Op is not completed yet) */ |
87 | 80 | ||
@@ -95,7 +88,7 @@ acpi_ps_delete_parse_tree ( | |||
95 | next = op->common.next; | 88 | next = op->common.next; |
96 | parent = op->common.parent; | 89 | parent = op->common.parent; |
97 | 90 | ||
98 | acpi_ps_free_op (op); | 91 | acpi_ps_free_op(op); |
99 | 92 | ||
100 | /* If we are back to the starting point, the walk is complete. */ | 93 | /* If we are back to the starting point, the walk is complete. */ |
101 | 94 | ||
@@ -104,8 +97,7 @@ acpi_ps_delete_parse_tree ( | |||
104 | } | 97 | } |
105 | if (next) { | 98 | if (next) { |
106 | op = next; | 99 | op = next; |
107 | } | 100 | } else { |
108 | else { | ||
109 | op = parent; | 101 | op = parent; |
110 | } | 102 | } |
111 | } | 103 | } |