1 files changed, 16 insertions, 16 deletions

diff --git a/sys/contrib/dev/acpica/exnames.c b/sys/contrib/dev/acpica/exnames.c
index c05113c0dbd6..85edbba9330c 100644
--- a/sys/contrib/dev/acpica/exnames.c
+++ b/sys/contrib/dev/acpica/exnames.c
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exnames - interpreter/scanner name load/execute
- *              $Revision: 80 $
+ *              $Revision: 81 $
  *
  *****************************************************************************/
 
@@ -270,18 +270,18 @@ AcpiExNameSegment (
 
     if ('0' <= CharBuf[0] && CharBuf[0] <= '9')
     {
-        DEBUG_PRINTP (ACPI_ERROR, ("leading digit: %c\n", CharBuf[0]));
+        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "leading digit: %c\n", CharBuf[0]));
         return_ACPI_STATUS (AE_CTRL_PENDING);
     }
 
-    DEBUG_PRINTP (TRACE_LOAD, ("Bytes from stream:\n"));
+    ACPI_DEBUG_PRINT ((ACPI_DB_LOAD, "Bytes from stream:\n"));
 
     for (Index = 4;
         (Index > 0) && (AcpiUtValidAcpiCharacter (*AmlAddress));
         --Index)
     {
         CharBuf[4 - Index] = *AmlAddress++;
-        DEBUG_PRINT (TRACE_LOAD, ("%c\n", CharBuf[4 - Index]));
+        ACPI_DEBUG_PRINT ((ACPI_DB_LOAD, "%c\n", CharBuf[4 - Index]));
     }
 
 
@@ -296,14 +296,14 @@ AcpiExNameSegment (
         if (NameString)
         {
             STRCAT (NameString, CharBuf);
-            DEBUG_PRINTP (TRACE_NAMES,
-                ("Appended to - %s \n", NameString));
+            ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+                "Appended to - %s \n", NameString));
         }
 
         else
         {
-            DEBUG_PRINTP (TRACE_NAMES,
-                ("No Name string - %s \n", CharBuf));
+            ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+                "No Name string - %s \n", CharBuf));
         }
     }
 
@@ -313,8 +313,8 @@ AcpiExNameSegment (
          * First character was not a valid name character,
          * so we are looking at something other than a name.
          */
-        DEBUG_PRINTP (ACPI_INFO,
-            ("Leading character is not alpha: %02Xh (not a name)\n",
+        ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+            "Leading character is not alpha: %02Xh (not a name)\n",
             CharBuf[0]));
         Status = AE_CTRL_PENDING;
     }
@@ -324,7 +324,7 @@ AcpiExNameSegment (
         /* Segment started with one or more valid characters, but fewer than 4 */
 
         Status = AE_AML_BAD_NAME;
-        DEBUG_PRINTP (ACPI_ERROR, ("Bad character %02x in name, at %p\n",
+        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Bad character %02x in name, at %p\n",
             *AmlAddress, AmlAddress));
     }
 
@@ -395,7 +395,7 @@ AcpiExGetNameString (
         case AML_ROOT_PREFIX:
 
             Prefix = *AmlAddress++;
-            DEBUG_PRINT (TRACE_LOAD, ("RootPrefix: %x\n", Prefix));
+            ACPI_DEBUG_PRINT ((ACPI_DB_LOAD, "RootPrefix: %x\n", Prefix));
 
             /*
              * Remember that we have a RootPrefix --
@@ -413,7 +413,7 @@ AcpiExGetNameString (
             do
             {
                 Prefix = *AmlAddress++;
-                DEBUG_PRINT (TRACE_LOAD, ("ParentPrefix: %x\n", Prefix));
+                ACPI_DEBUG_PRINT ((ACPI_DB_LOAD, "ParentPrefix: %x\n", Prefix));
 
                 ++PrefixCount;
 
@@ -436,7 +436,7 @@ AcpiExGetNameString (
         case AML_DUAL_NAME_PREFIX:
 
             Prefix = *AmlAddress++;
-            DEBUG_PRINT (TRACE_LOAD, ("DualNamePrefix: %x\n", Prefix));
+            ACPI_DEBUG_PRINT ((ACPI_DB_LOAD, "DualNamePrefix: %x\n", Prefix));
 
             NameString = AcpiExAllocateNameString (PrefixCount, 2);
             if (!NameString)
@@ -459,7 +459,7 @@ AcpiExGetNameString (
         case AML_MULTI_NAME_PREFIX_OP:
 
             Prefix = *AmlAddress++;
-            DEBUG_PRINT (TRACE_LOAD, ("MultiNamePrefix: %x\n", Prefix));
+            ACPI_DEBUG_PRINT ((ACPI_DB_LOAD, "MultiNamePrefix: %x\n", Prefix));
 
             /* Fetch count of segments remaining in name path */
 
@@ -490,7 +490,7 @@ AcpiExGetNameString (
 
             if (-1 == PrefixCount)
             {
-                DEBUG_PRINTP (TRACE_EXEC, ("NameSeg is \"\\\" followed by NULL\n"));
+                ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "NameSeg is \"\\\" followed by NULL\n"));
             }
 
             /* Consume the NULL byte */