patch-2.4.26 linux-2.4.26/drivers/acpi/parser/psscope.c
Next file: linux-2.4.26/drivers/acpi/pci_irq.c
Previous file: linux-2.4.26/drivers/acpi/parser/psparse.c
Back to the patch index
Back to the overall index
- Lines: 55
- Date:
2004-04-14 06:05:29.000000000 -0700
- Orig file:
linux-2.4.25/drivers/acpi/parser/psscope.c
- Orig date:
2004-02-18 05:36:31.000000000 -0800
diff -urN linux-2.4.25/drivers/acpi/parser/psscope.c linux-2.4.26/drivers/acpi/parser/psscope.c
@@ -167,7 +167,6 @@
return_ACPI_STATUS (AE_NO_MEMORY);
}
-
scope->common.data_type = ACPI_DESC_TYPE_STATE_PSCOPE;
scope->parse_scope.op = op;
scope->parse_scope.arg_list = remaining_args;
@@ -178,13 +177,11 @@
acpi_ut_push_generic_state (&parser_state->scope, scope);
-
if (arg_count == ACPI_VAR_ARGS) {
/* multiple arguments */
scope->parse_scope.arg_end = parser_state->pkg_end;
}
-
else {
/* single argument */
@@ -241,7 +238,6 @@
acpi_ut_delete_generic_state (scope);
}
-
else {
/* empty parse stack, prepare to fetch next opcode */
@@ -250,7 +246,6 @@
*arg_count = 0;
}
-
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Popped Op %p Args %X\n", *op, *arg_count));
return_VOID;
}
@@ -275,14 +270,14 @@
{
union acpi_generic_state *scope;
+
ACPI_FUNCTION_TRACE_PTR ("ps_cleanup_scope", parser_state);
if (!parser_state) {
- return;
+ return_VOID;
}
-
/* Delete anything on the scope stack */
while (parser_state->scope) {
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)