1 files changed, 27 insertions, 24 deletions

diff --git a/sys/contrib/dev/acpica/nssearch.c b/sys/contrib/dev/acpica/nssearch.c
index 03f6cc4..cdef414 100644
--- a/sys/contrib/dev/acpica/nssearch.c
+++ b/sys/contrib/dev/acpica/nssearch.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: nssearch - Namespace search
- *              $Revision: 101 $
+ *              $Revision: 103 $
  *
  ******************************************************************************/
 
@@ -172,8 +172,10 @@ AcpiNsSearchNode (
         ScopeName = AcpiNsGetExternalPathname (Node);
         if (ScopeName)
         {
-            ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Searching %s (%p) For [%4.4s] (%s)\n",
-                ScopeName, Node, (char *) &TargetName, AcpiUtGetTypeName (Type)));
+            ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+                "Searching %s (%p) For [%4.4s] (%s)\n",
+                ScopeName, Node, (char *) &TargetName,
+                AcpiUtGetTypeName (Type)));
 
             ACPI_MEM_FREE (ScopeName);
         }
@@ -244,7 +246,7 @@ AcpiNsSearchNode (
  * PARAMETERS:  *TargetName         - Ascii ACPI name to search for
  *              *Node               - Starting node where search will begin
  *              Type                - Object type to match
- *              **ReturnNode        - Where the matched Named Obj is returned
+ *              **ReturnNode        - Where the matched Node is returned
  *
  * RETURN:      Status
  *
@@ -279,14 +281,14 @@ AcpiNsSearchParentTree (
     ParentNode = AcpiNsGetParentNode (Node);
 
     /*
-     * If there is no parent (i.e., we are at the root) or
-     * type is "local", we won't be searching the parent tree.
+     * If there is no parent (i.e., we are at the root) or type is "local",
+     * we won't be searching the parent tree.
      */
     if (!ParentNode)
     {
         ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "[%4.4s] has no parent\n",
             (char *) &TargetName));
-         return_ACPI_STATUS (AE_NOT_FOUND);
+        return_ACPI_STATUS (AE_NOT_FOUND);
     }
 
     if (AcpiNsLocal (Type))
@@ -299,11 +301,12 @@ AcpiNsSearchParentTree (
 
     /* Search the parent tree */
 
-    ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Searching parent for %4.4s\n", (char *) &TargetName));
+    ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+        "Searching parent [%4.4s] for [%4.4s]\n",
+        AcpiUtGetNodeName (ParentNode), (char *) &TargetName));
 
     /*
-     * Search parents until found the target or we have backed up to
-     * the root
+     * Search parents until target is found or we have backed up to the root
      */
     while (ParentNode)
     {
@@ -313,7 +316,7 @@ AcpiNsSearchParentTree (
          * the actual name we are searching for.  Typechecking comes later.
          */
         Status = AcpiNsSearchNode (TargetName, ParentNode,
-                                        ACPI_TYPE_ANY, ReturnNode);
+                                    ACPI_TYPE_ANY, ReturnNode);
         if (ACPI_SUCCESS (Status))
         {
             return_ACPI_STATUS (Status);
@@ -378,7 +381,8 @@ AcpiNsSearchAndEnter (
 
     if (!Node || !TargetName || !ReturnNode)
     {
-        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Null param: Node %p Name %X ReturnNode %p\n",
+        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+            "Null param: Node %p Name %X ReturnNode %p\n",
             Node, TargetName, ReturnNode));
 
         ACPI_REPORT_ERROR (("NsSearchAndEnter: Null parameter\n"));
@@ -418,23 +422,21 @@ AcpiNsSearchAndEnter (
     }
 
     /*
-     * The name was not found.  If we are NOT performing the
-     * first pass (name entry) of loading the namespace, search
-     * the parent tree (all the way to the root if necessary.)
-     * We don't want to perform the parent search when the
-     * namespace is actually being loaded.  We want to perform
-     * the search when namespace references are being resolved
-     * (load pass 2) and during the execution phase.
+     * The name was not found.  If we are NOT performing the first pass
+     * (name entry) of loading the namespace, search the parent tree (all the
+     * way to the root if necessary.) We don't want to perform the parent
+     * search when the namespace is actually being loaded.  We want to perform
+     * the search when namespace references are being resolved (load pass 2)
+     * and during the execution phase.
      */
     if ((InterpreterMode != ACPI_IMODE_LOAD_PASS1) &&
         (Flags & ACPI_NS_SEARCH_PARENT))
     {
         /*
-         * Not found at this level - search parent tree according
-         * to ACPI specification
+         * Not found at this level - search parent tree according to the
+         * ACPI specification
          */
-        Status = AcpiNsSearchParentTree (TargetName, Node,
-                                            Type, ReturnNode);
+        Status = AcpiNsSearchParentTree (TargetName, Node, Type, ReturnNode);
         if (ACPI_SUCCESS (Status))
         {
             return_ACPI_STATUS (Status);
@@ -446,7 +448,8 @@ AcpiNsSearchAndEnter (
      */
     if (InterpreterMode == ACPI_IMODE_EXECUTE)
     {
-        ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "%4.4s Not found in %p [Not adding]\n",
+        ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+            "%4.4s Not found in %p [Not adding]\n",
             (char *) &TargetName, Node));
 
         return_ACPI_STATUS (AE_NOT_FOUND);