Vendor import of the Intel ACPI CA 20020611 drop.

1 files changed, 8 insertions, 9 deletions

diff --git a/sys/contrib/dev/acpica/nsalloc.c b/sys/contrib/dev/acpica/nsalloc.c
index 3db018ccf34c..cab91bdd76f0 100644
--- a/sys/contrib/dev/acpica/nsalloc.c
+++ b/sys/contrib/dev/acpica/nsalloc.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: nsalloc - Namespace allocation and deletion utilities
- *              $Revision: 72 $
+ *              $Revision: 74 $
  *
  ******************************************************************************/
 
@@ -119,7 +119,6 @@
 
 #include "acpi.h"
 #include "acnamesp.h"
-#include "acinterp.h"
 
 
 #define _COMPONENT          ACPI_NAMESPACE
@@ -310,7 +309,7 @@ AcpiNsInstallNode (
          * real definition is found later.
          */
         ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "[%4.4s] is a forward reference\n",
-            (char *) &Node->Name));
+            Node->Name.Ascii));
     }
 
     /*
@@ -337,7 +336,7 @@ AcpiNsInstallNode (
     }
 
     ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "%4.4s added to %p at %p\n",
-        (char *) &Node->Name, ParentNode, Node));
+        Node->Name.Ascii, ParentNode, Node));
 
     /*
      * Increment the reference count(s) of all parents up to
@@ -449,7 +448,7 @@ AcpiNsDeleteChildren (
  *
  ******************************************************************************/
 
-ACPI_STATUS
+void
 AcpiNsDeleteNamespaceSubtree (
     ACPI_NAMESPACE_NODE     *ParentNode)
 {
@@ -462,7 +461,7 @@ AcpiNsDeleteNamespaceSubtree (
 
     if (!ParentNode)
     {
-        return_ACPI_STATUS (AE_OK);
+        return_VOID;
     }
 
     /*
@@ -518,7 +517,7 @@ AcpiNsDeleteNamespaceSubtree (
         }
     }
 
-    return_ACPI_STATUS (AE_OK);
+    return_VOID;
 }
 
 
@@ -592,7 +591,7 @@ AcpiNsRemoveReference (
  *
  ******************************************************************************/
 
-ACPI_STATUS
+void
 AcpiNsDeleteNamespaceByOwner (
     UINT16                  OwnerId)
 {
@@ -679,7 +678,7 @@ AcpiNsDeleteNamespaceByOwner (
         }
     }
 
-    return_ACPI_STATUS (AE_OK);
+    return_VOID;
 }