patch-2.4.6 linux/drivers/acpi/parser/psscope.c

• Lines: 74
• Date: Wed Jun 20 17:47:40 2001
• Orig file: v2.4.5/linux/drivers/acpi/parser/psscope.c
• Orig date: Mon Jan 22 13:23:43 2001

diff -u --recursive --new-file v2.4.5/linux/drivers/acpi/parser/psscope.c linux/drivers/acpi/parser/psscope.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: psscope - Parser scope stack management routines
- *              $Revision: 24 $
+ *              $Revision: 27 $
  *
  *****************************************************************************/
 
@@ -27,7 +27,7 @@
 #include "acpi.h"
 #include "acparser.h"
 
-#define _COMPONENT          PARSER
+#define _COMPONENT          ACPI_PARSER
 	 MODULE_NAME         ("psscope")
 
 
@@ -95,7 +95,7 @@
 	ACPI_GENERIC_STATE      *scope;
 
 
-	scope = acpi_cm_create_generic_state ();
+	scope = acpi_ut_create_generic_state ();
 	if (!scope) {
 		return (AE_NO_MEMORY);
 	}
@@ -137,7 +137,7 @@
 	ACPI_GENERIC_STATE      *scope;
 
 
-	scope = acpi_cm_create_generic_state ();
+	scope = acpi_ut_create_generic_state ();
 	if (!scope) {
 		return (AE_NO_MEMORY);
 	}
@@ -150,7 +150,7 @@
 
 	/* Push onto scope stack */
 
-	acpi_cm_push_generic_state (&parser_state->scope, scope);
+	acpi_ut_push_generic_state (&parser_state->scope, scope);
 
 
 	if (arg_count == ACPI_VAR_ARGS) {
@@ -199,7 +199,7 @@
 	 * Only pop the scope if there is in fact a next scope
 	 */
 	if (scope->common.next) {
-		scope = acpi_cm_pop_generic_state (&parser_state->scope);
+		scope = acpi_ut_pop_generic_state (&parser_state->scope);
 
 
 		/* return to parsing previous op */
@@ -211,7 +211,7 @@
 
 		/* All done with this scope state structure */
 
-		acpi_cm_delete_generic_state (scope);
+		acpi_ut_delete_generic_state (scope);
 	}
 
 	else {
@@ -255,8 +255,8 @@
 	/* Delete anything on the scope stack */
 
 	while (parser_state->scope) {
-		scope = acpi_cm_pop_generic_state (&parser_state->scope);
-		acpi_cm_delete_generic_state (scope);
+		scope = acpi_ut_pop_generic_state (&parser_state->scope);
+		acpi_ut_delete_generic_state (scope);
 	}
 
 	return;