16 files changed, 166 insertions, 155 deletions

diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c
index edfbe34600f5..1149bc18fb35 100644
--- a/drivers/acpi/namespace/nsaccess.c
+++ b/drivers/acpi/namespace/nsaccess.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -110,10 +110,9 @@ acpi_status acpi_ns_root_initialize(void)
                                         ACPI_NS_NO_UPSEARCH, NULL, &new_node);
 
                 if (ACPI_FAILURE(status) || (!new_node)) {      /* Must be on same line for code converter */
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Could not create predefined name %s, %s\n",
-                                          init_val->name,
-                                          acpi_format_exception(status)));
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "Could not create predefined name %s",
+                                        init_val->name));
                 }
 
                 /*
@@ -124,9 +123,9 @@ acpi_status acpi_ns_root_initialize(void)
                 if (init_val->val) {
                         status = acpi_os_predefined_override(init_val, &val);
                         if (ACPI_FAILURE(status)) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Could not override predefined %s\n",
-                                                  init_val->name));
+                                ACPI_ERROR((AE_INFO,
+                                            "Could not override predefined %s",
+                                            init_val->name));
                         }
 
                         if (!val) {
@@ -233,7 +232,9 @@ acpi_status acpi_ns_root_initialize(void)
 
                         default:
 
-                                ACPI_REPORT_ERROR(("Unsupported initial type value %X\n", init_val->type));
+                                ACPI_ERROR((AE_INFO,
+                                            "Unsupported initial type value %X",
+                                            init_val->type));
                                 acpi_ut_remove_reference(obj_desc);
                                 obj_desc = NULL;
                                 continue;
@@ -339,7 +340,9 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                 prefix_node = scope_info->scope.node;
                 if (ACPI_GET_DESCRIPTOR_TYPE(prefix_node) !=
                     ACPI_DESC_TYPE_NAMED) {
-                        ACPI_REPORT_ERROR(("ns_lookup: %p is not a namespace node [%s]\n", prefix_node, acpi_ut_get_descriptor_name(prefix_node)));
+                        ACPI_ERROR((AE_INFO, "%p is not a namespace node [%s]",
+                                    prefix_node,
+                                    acpi_ut_get_descriptor_name(prefix_node)));
                         return_ACPI_STATUS(AE_AML_INTERNAL);
                 }
 
@@ -429,7 +432,8 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                                 if (!this_node) {
                                         /* Current scope has no parent scope */
 
-                                        ACPI_REPORT_ERROR(("ACPI path has too many parent prefixes (^) - reached beyond root node\n"));
+                                        ACPI_ERROR((AE_INFO,
+                                                    "ACPI path has too many parent prefixes (^) - reached beyond root node"));
                                         return_ACPI_STATUS(AE_NOT_FOUND);
                                 }
                         }
@@ -498,7 +502,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                         path++;
 
                         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
-                                          "Multi Pathname (%d Segments, Flags=%X) \n",
+                                          "Multi Pathname (%d Segments, Flags=%X)\n",
                                           num_segments, flags));
                         break;
 
@@ -600,7 +604,12 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                     (this_node->type != type_to_check_for)) {
                         /* Complain about a type mismatch */
 
-                        ACPI_REPORT_WARNING(("ns_lookup: Type mismatch on %4.4s (%s), searching for (%s)\n", (char *)&simple_name, acpi_ut_get_type_name(this_node->type), acpi_ut_get_type_name(type_to_check_for)));
+                        ACPI_WARNING((AE_INFO,
+                                      "ns_lookup: Type mismatch on %4.4s (%s), searching for (%s)",
+                                      ACPI_CAST_PTR(char, &simple_name),
+                                      acpi_ut_get_type_name(this_node->type),
+                                      acpi_ut_get_type_name
+                                      (type_to_check_for)));
                 }
 
                 /*
diff --git a/drivers/acpi/namespace/nsalloc.c b/drivers/acpi/namespace/nsalloc.c
index cc7a85f8cfe6..9b871f38b61b 100644
--- a/drivers/acpi/namespace/nsalloc.c
+++ b/drivers/acpi/namespace/nsalloc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -272,9 +272,8 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node)
                 /* Grandchildren should have all been deleted already */
 
                 if (child_node->child) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Found a grandchild! P=%p C=%p\n",
-                                          parent_node, child_node));
+                        ACPI_ERROR((AE_INFO, "Found a grandchild! P=%p C=%p",
+                                    parent_node, child_node));
                 }
 
                 /* Now we can free this child object */
@@ -302,7 +301,9 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node)
                 /* There should be only one reference remaining on this node */
 
                 if (child_node->reference_count != 1) {
-                        ACPI_REPORT_WARNING(("Existing references (%d) on node being deleted (%p)\n", child_node->reference_count, child_node));
+                        ACPI_WARNING((AE_INFO,
+                                      "Existing references (%d) on node being deleted (%p)",
+                                      child_node->reference_count, child_node));
                 }
 
                 /* Now we can delete the node */
diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
index 9faf1d5c86ed..a2807317a84b 100644
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/namespace/nsdump.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -198,12 +198,13 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                 /* Check the node type and name */
 
                 if (type > ACPI_TYPE_LOCAL_MAX) {
-                        ACPI_REPORT_WARNING(("Invalid ACPI Type %08X\n", type));
+                        ACPI_WARNING((AE_INFO, "Invalid ACPI Object Type %08X",
+                                      type));
                 }
 
                 if (!acpi_ut_valid_acpi_name(this_node->name.integer)) {
-                        ACPI_REPORT_WARNING(("Invalid ACPI Name %08X\n",
-                                             this_node->name.integer));
+                        ACPI_WARNING((AE_INFO, "Invalid ACPI Name %08X",
+                                      this_node->name.integer));
                 }
 
                 acpi_os_printf("%4.4s", acpi_ut_get_node_name(this_node));
@@ -212,7 +213,9 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
         /*
          * Now we can print out the pertinent information
          */
-        acpi_os_printf(" %-12s %p ", acpi_ut_get_type_name(type), this_node);
+        acpi_os_printf(" %-12s %p %2.2X ",
+                       acpi_ut_get_type_name(type), this_node,
+                       this_node->owner_id);
 
         dbg_level = acpi_dbg_level;
         acpi_dbg_level = 0;
diff --git a/drivers/acpi/namespace/nsdumpdv.c b/drivers/acpi/namespace/nsdumpdv.c
index 55de883943d6..aff899a935e3 100644
--- a/drivers/acpi/namespace/nsdumpdv.c
+++ b/drivers/acpi/namespace/nsdumpdv.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nseval.c b/drivers/acpi/namespace/nseval.c
index 0191c7d92824..19d7b94d40c3 100644
--- a/drivers/acpi/namespace/nseval.c
+++ b/drivers/acpi/namespace/nseval.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -373,8 +373,7 @@ acpi_ns_execute_control_method(struct acpi_parameter_info *info)
 
         info->obj_desc = acpi_ns_get_attached_object(info->node);
         if (!info->obj_desc) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "No attached method object\n"));
+                ACPI_ERROR((AE_INFO, "No attached method object"));
 
                 (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
                 return_ACPI_STATUS(AE_NULL_OBJECT);
diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c
index 0a08d2f04a06..9f929e479fd8 100644
--- a/drivers/acpi/namespace/nsinit.c
+++ b/drivers/acpi/namespace/nsinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -93,8 +93,7 @@ acpi_status acpi_ns_initialize_objects(void)
                                      ACPI_UINT32_MAX, acpi_ns_init_one_object,
                                      &info, NULL);
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "walk_namespace failed! %s\n",
-                                  acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "During walk_namespace"));
         }
 
         ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
@@ -159,12 +158,11 @@ acpi_status acpi_ns_initialize_devices(void)
         (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
 
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "walk_namespace failed! %s\n",
-                                  acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "During walk_namespace"));
         }
 
         ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
-                              "\n%hd Devices found containing: %hd _STA, %hd _INI methods\n",
+                              "\n%hd Devices found - executed %hd _STA, %hd _INI methods\n",
                               info.device_count, info.num_STA, info.num_INI));
 
         return_ACPI_STATUS(status);
@@ -289,12 +287,10 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
         }
 
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_ERROR, "\n"));
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Could not execute arguments for [%4.4s] (%s), %s\n",
-                                  acpi_ut_get_node_name(node),
-                                  acpi_ut_get_type_name(type),
-                                  acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not execute arguments for [%4.4s] (%s)",
+                                acpi_ut_get_node_name(node),
+                                acpi_ut_get_type_name(type)));
         }
 
         /*
@@ -336,23 +332,22 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
         struct acpi_parameter_info pinfo;
         u32 flags;
         acpi_status status;
+        struct acpi_namespace_node *ini_node;
+        struct acpi_namespace_node *device_node;
 
         ACPI_FUNCTION_TRACE("ns_init_one_device");
 
-        pinfo.parameters = NULL;
-        pinfo.parameter_type = ACPI_PARAM_ARGS;
-
-        pinfo.node = acpi_ns_map_handle_to_node(obj_handle);
-        if (!pinfo.node) {
+        device_node = acpi_ns_map_handle_to_node(obj_handle);
+        if (!device_node) {
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         /*
          * We will run _STA/_INI on Devices, Processors and thermal_zones only
          */
-        if ((pinfo.node->type != ACPI_TYPE_DEVICE) &&
-            (pinfo.node->type != ACPI_TYPE_PROCESSOR) &&
-            (pinfo.node->type != ACPI_TYPE_THERMAL)) {
+        if ((device_node->type != ACPI_TYPE_DEVICE) &&
+            (device_node->type != ACPI_TYPE_PROCESSOR) &&
+            (device_node->type != ACPI_TYPE_THERMAL)) {
                 return_ACPI_STATUS(AE_OK);
         }
 
@@ -364,57 +359,69 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
         info->device_count++;
 
         /*
-         * Run _STA to determine if we can run _INI on the device.
+         * Check if the _INI method exists for this device -
+         * if _INI does not exist, there is no need to run _STA
+         * No _INI means device requires no initialization
+         */
+        status = acpi_ns_search_node(*ACPI_CAST_PTR(u32, METHOD_NAME__INI),
+                                     device_node, ACPI_TYPE_METHOD, &ini_node);
+        if (ACPI_FAILURE(status)) {
+                /* No _INI method found - move on to next device */
+
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /*
+         * Run _STA to determine if we can run _INI on the device -
+         * the device must be present before _INI can be run.
+         * However, _STA is not required - assume device present if no _STA
          */
         ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname(ACPI_TYPE_METHOD,
-                                                      pinfo.node,
+                                                      device_node,
                                                       METHOD_NAME__STA));
-        status = acpi_ut_execute_STA(pinfo.node, &flags);
 
+        pinfo.node = device_node;
+        pinfo.parameters = NULL;
+        pinfo.parameter_type = ACPI_PARAM_ARGS;
+
+        status = acpi_ut_execute_STA(pinfo.node, &flags);
         if (ACPI_FAILURE(status)) {
-                if (pinfo.node->type == ACPI_TYPE_DEVICE) {
-                        /* Ignore error and move on to next device */
+                /* Ignore error and move on to next device */
 
-                        return_ACPI_STATUS(AE_OK);
-                }
+                return_ACPI_STATUS(AE_OK);
+        }
 
-                /* _STA is not required for Processor or thermal_zone objects */
-        } else {
+        if (flags != ACPI_UINT32_MAX) {
                 info->num_STA++;
+        }
 
-                if (!(flags & 0x01)) {
-                        /* Don't look at children of a not present device */
+        if (!(flags & ACPI_STA_DEVICE_PRESENT)) {
+                /* Don't look at children of a not present device */
 
-                        return_ACPI_STATUS(AE_CTRL_DEPTH);
-                }
+                return_ACPI_STATUS(AE_CTRL_DEPTH);
         }
 
         /*
-         * The device is present. Run _INI.
+         * The device is present and _INI exists. Run the _INI method.
+         * (We already have the _INI node from above)
          */
         ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname(ACPI_TYPE_METHOD,
                                                       pinfo.node,
                                                       METHOD_NAME__INI));
-        status = acpi_ns_evaluate_relative(METHOD_NAME__INI, &pinfo);
-        if (ACPI_FAILURE(status)) {
-                /* No _INI (AE_NOT_FOUND) means device requires no initialization */
 
-                if (status != AE_NOT_FOUND) {
-                        /* Ignore error and move on to next device */
+        pinfo.node = ini_node;
+        status = acpi_ns_evaluate_by_handle(&pinfo);
+        if (ACPI_FAILURE(status)) {
+                /* Ignore error and move on to next device */
 
 #ifdef ACPI_DEBUG_OUTPUT
-                        char *scope_name =
-                            acpi_ns_get_external_pathname(pinfo.node);
+                char *scope_name = acpi_ns_get_external_pathname(ini_node);
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_WARN, "%s._INI failed: %s\n",
-                                          scope_name,
-                                          acpi_format_exception(status)));
+                ACPI_WARNING((AE_INFO, "%s._INI failed: %s",
+                              scope_name, acpi_format_exception(status)));
 
-                        ACPI_MEM_FREE(scope_name);
+                ACPI_MEM_FREE(scope_name);
 #endif
-                }
-
-                status = AE_OK;
         } else {
                 /* Delete any return object (especially if implicit_return is enabled) */
 
@@ -434,5 +441,5 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
                     acpi_gbl_init_handler(pinfo.node, ACPI_INIT_DEVICE_INI);
         }
 
-        return_ACPI_STATUS(status);
+        return_ACPI_STATUS(AE_OK);
 }
diff --git a/drivers/acpi/namespace/nsload.c b/drivers/acpi/namespace/nsload.c
index c28849de465a..4e0b0524c188 100644
--- a/drivers/acpi/namespace/nsload.c
+++ b/drivers/acpi/namespace/nsload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -92,7 +92,7 @@ acpi_ns_load_table(struct acpi_table_desc *table_desc,
         /* Check validity of the AML start and length */
 
         if (!table_desc->aml_start) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null AML pointer\n"));
+                ACPI_ERROR((AE_INFO, "Null AML pointer"));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
@@ -102,8 +102,8 @@ acpi_ns_load_table(struct acpi_table_desc *table_desc,
         /* Ignore table if there is no AML contained within */
 
         if (!table_desc->aml_length) {
-                ACPI_REPORT_WARNING(("Zero-length AML block in table [%4.4s]\n",
-                                     table_desc->pointer->signature));
+                ACPI_WARNING((AE_INFO, "Zero-length AML block in table [%4.4s]",
+                              table_desc->pointer->signature));
                 return_ACPI_STATUS(AE_OK);
         }
 
@@ -263,7 +263,7 @@ acpi_status acpi_ns_load_namespace(void)
         /* There must be at least a DSDT installed */
 
         if (acpi_gbl_DSDT == NULL) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "DSDT is not in memory\n"));
+                ACPI_ERROR((AE_INFO, "DSDT is not in memory"));
                 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
         }
 
diff --git a/drivers/acpi/namespace/nsnames.c b/drivers/acpi/namespace/nsnames.c
index d5e8dea61c27..639f653b4b6b 100644
--- a/drivers/acpi/namespace/nsnames.c
+++ b/drivers/acpi/namespace/nsnames.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -75,7 +75,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,
         acpi_size index;
         struct acpi_namespace_node *parent_node;
 
-        ACPI_FUNCTION_NAME("ns_build_external_path");
+        ACPI_FUNCTION_ENTRY();
 
         /* Special case for root */
 
@@ -110,9 +110,9 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,
         name_buffer[index] = AML_ROOT_PREFIX;
 
         if (index != 0) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Could not construct pathname; index=%X, size=%X, Path=%s\n",
-                                  (u32) index, (u32) size, &name_buffer[size]));
+                ACPI_ERROR((AE_INFO,
+                            "Could not construct pathname; index=%X, size=%X, Path=%s",
+                            (u32) index, (u32) size, &name_buffer[size]));
         }
 
         return;
@@ -148,7 +148,7 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
 
         name_buffer = ACPI_MEM_CALLOCATE(size);
         if (!name_buffer) {
-                ACPI_REPORT_ERROR(("ns_get_table_pathname: allocation failure\n"));
+                ACPI_ERROR((AE_INFO, "Allocation failure"));
                 return_PTR(NULL);
         }
 
@@ -241,7 +241,7 @@ acpi_ns_handle_to_pathname(acpi_handle target_handle,
 
         acpi_ns_build_external_path(node, required_size, buffer->pointer);
 
-        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%s [%X] \n",
+        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%s [%X]\n",
                           (char *)buffer->pointer, (u32) required_size));
         return_ACPI_STATUS(AE_OK);
 }
diff --git a/drivers/acpi/namespace/nsobject.c b/drivers/acpi/namespace/nsobject.c
index fc9be946ebed..10ae6292bca4 100644
--- a/drivers/acpi/namespace/nsobject.c
+++ b/drivers/acpi/namespace/nsobject.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -84,22 +84,23 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,
         if (!node) {
                 /* Invalid handle */
 
-                ACPI_REPORT_ERROR(("ns_attach_object: Null named_obj handle\n"));
+                ACPI_ERROR((AE_INFO, "Null named_obj handle"));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         if (!object && (ACPI_TYPE_ANY != type)) {
                 /* Null object */
 
-                ACPI_REPORT_ERROR(("ns_attach_object: Null object, but type not ACPI_TYPE_ANY\n"));
+                ACPI_ERROR((AE_INFO,
+                            "Null object, but type not ACPI_TYPE_ANY"));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         if (ACPI_GET_DESCRIPTOR_TYPE(node) != ACPI_DESC_TYPE_NAMED) {
                 /* Not a name handle */
 
-                ACPI_REPORT_ERROR(("ns_attach_object: Invalid handle %p [%s]\n",
-                                   node, acpi_ut_get_descriptor_name(node)));
+                ACPI_ERROR((AE_INFO, "Invalid handle %p [%s]",
+                            node, acpi_ut_get_descriptor_name(node)));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
@@ -254,7 +255,7 @@ union acpi_operand_object *acpi_ns_get_attached_object(struct
         ACPI_FUNCTION_TRACE_PTR("ns_get_attached_object", node);
 
         if (!node) {
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Null Node ptr\n"));
+                ACPI_WARNING((AE_INFO, "Null Node ptr"));
                 return_PTR(NULL);
         }
 
diff --git a/drivers/acpi/namespace/nsparse.c b/drivers/acpi/namespace/nsparse.c
index 433442a9ec74..232be4303653 100644
--- a/drivers/acpi/namespace/nsparse.c
+++ b/drivers/acpi/namespace/nsparse.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/namespace/nssearch.c
index 50a3ca5470ed..d64b78952f24 100644
--- a/drivers/acpi/namespace/nssearch.c
+++ b/drivers/acpi/namespace/nssearch.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -99,8 +99,8 @@ acpi_ns_search_node(u32 target_name,
                 if (scope_name) {
                         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                                           "Searching %s (%p) For [%4.4s] (%s)\n",
-                                          scope_name, node,
-                                          (char *)&target_name,
+                                          scope_name, node, ACPI_CAST_PTR(char,
+                                                                          &target_name),
                                           acpi_ut_get_type_name(type)));
 
                         ACPI_MEM_FREE(scope_name);
@@ -131,7 +131,7 @@ acpi_ns_search_node(u32 target_name,
                          */
                         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                                           "Name [%4.4s] (%s) %p found in scope [%4.4s] %p\n",
-                                          (char *)&target_name,
+                                          ACPI_CAST_PTR(char, &target_name),
                                           acpi_ut_get_type_name(next_node->
                                                                 type),
                                           next_node,
@@ -160,7 +160,8 @@ acpi_ns_search_node(u32 target_name,
 
         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                           "Name [%4.4s] (%s) not found in search in scope [%4.4s] %p first child %p\n",
-                          (char *)&target_name, acpi_ut_get_type_name(type),
+                          ACPI_CAST_PTR(char, &target_name),
+                          acpi_ut_get_type_name(type),
                           acpi_ut_get_node_name(node), node, node->child));
 
         return_ACPI_STATUS(AE_NOT_FOUND);
@@ -210,14 +211,14 @@ acpi_ns_search_parent_tree(u32 target_name,
          */
         if (!parent_node) {
                 ACPI_DEBUG_PRINT((ACPI_DB_NAMES, "[%4.4s] has no parent\n",
-                                  (char *)&target_name));
+                                  ACPI_CAST_PTR(char, &target_name)));
                 return_ACPI_STATUS(AE_NOT_FOUND);
         }
 
         if (acpi_ns_local(type)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                                   "[%4.4s] type [%s] must be local to this scope (no parent search)\n",
-                                  (char *)&target_name,
+                                  ACPI_CAST_PTR(char, &target_name),
                                   acpi_ut_get_type_name(type)));
                 return_ACPI_STATUS(AE_NOT_FOUND);
         }
@@ -227,7 +228,7 @@ acpi_ns_search_parent_tree(u32 target_name,
         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                           "Searching parent [%4.4s] for [%4.4s]\n",
                           acpi_ut_get_node_name(parent_node),
-                          (char *)&target_name));
+                          ACPI_CAST_PTR(char, &target_name)));
 
         /*
          * Search parents until target is found or we have backed up to the root
@@ -297,18 +298,17 @@ acpi_ns_search_and_enter(u32 target_name,
         /* Parameter validation */
 
         if (!node || !target_name || !return_node) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Null param: Node %p Name %X return_node %p\n",
-                                  node, target_name, return_node));
-
-                ACPI_REPORT_ERROR(("ns_search_and_enter: Null parameter\n"));
+                ACPI_ERROR((AE_INFO,
+                            "Null param: Node %p Name %X return_node %p",
+                            node, target_name, return_node));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         /* Name must consist of printable characters */
 
         if (!acpi_ut_valid_acpi_name(target_name)) {
-                ACPI_REPORT_ERROR(("ns_search_and_enter: Bad character in ACPI Name: %X\n", target_name));
+                ACPI_ERROR((AE_INFO, "Bad character in ACPI Name: %X",
+                            target_name));
                 return_ACPI_STATUS(AE_BAD_CHARACTER);
         }
 
@@ -360,7 +360,7 @@ acpi_ns_search_and_enter(u32 target_name,
         if (interpreter_mode == ACPI_IMODE_EXECUTE) {
                 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                                   "%4.4s Not found in %p [Not adding]\n",
-                                  (char *)&target_name, node));
+                                  ACPI_CAST_PTR(char, &target_name), node));
 
                 return_ACPI_STATUS(AE_NOT_FOUND);
         }
diff --git a/drivers/acpi/namespace/nsutils.c b/drivers/acpi/namespace/nsutils.c
index ebec036423c9..3e7cad549a38 100644
--- a/drivers/acpi/namespace/nsutils.c
+++ b/drivers/acpi/namespace/nsutils.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,6 @@ acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node *node_to_search);
  *
  * PARAMETERS:  module_name         - Caller's module name (for error output)
  *              line_number         - Caller's line number (for error output)
- *              component_id        - Caller's component ID (for error output)
  *              internal_name       - Name or path of the namespace node
  *              lookup_status       - Exception code from NS lookup
  *
@@ -76,19 +75,17 @@ acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node *node_to_search);
 void
 acpi_ns_report_error(char *module_name,
                      u32 line_number,
-                     u32 component_id,
                      char *internal_name, acpi_status lookup_status)
 {
         acpi_status status;
         char *name = NULL;
 
-        acpi_os_printf("%8s-%04d: *** Error: Looking up ",
-                       module_name, line_number);
+        acpi_ut_report_error(module_name, line_number);
 
         if (lookup_status == AE_BAD_CHARACTER) {
                 /* There is a non-ascii character in the name */
 
-                acpi_os_printf("[0x%4.4X] (NON-ASCII)\n",
+                acpi_os_printf("[0x%4.4X] (NON-ASCII)",
                                *(ACPI_CAST_PTR(u32, internal_name)));
         } else {
                 /* Convert path to external format */
@@ -109,7 +106,7 @@ acpi_ns_report_error(char *module_name,
                 }
         }
 
-        acpi_os_printf(" in namespace, %s\n",
+        acpi_os_printf(" Namespace lookup failure, %s\n",
                        acpi_format_exception(lookup_status));
 }
 
@@ -119,10 +116,9 @@ acpi_ns_report_error(char *module_name,
  *
  * PARAMETERS:  module_name         - Caller's module name (for error output)
  *              line_number         - Caller's line number (for error output)
- *              component_id        - Caller's component ID (for error output)
  *              Message             - Error message to use on failure
  *              prefix_node         - Prefix relative to the path
- *              Path                - Path to the node
+ *              Path                - Path to the node (optional)
  *              method_status       - Execution status
  *
  * RETURN:      None
@@ -134,7 +130,6 @@ acpi_ns_report_error(char *module_name,
 void
 acpi_ns_report_method_error(char *module_name,
                             u32 line_number,
-                            u32 component_id,
                             char *message,
                             struct acpi_namespace_node *prefix_node,
                             char *path, acpi_status method_status)
@@ -142,17 +137,16 @@ acpi_ns_report_method_error(char *module_name,
         acpi_status status;
         struct acpi_namespace_node *node = prefix_node;
 
+        acpi_ut_report_error(module_name, line_number);
+
         if (path) {
                 status = acpi_ns_get_node_by_path(path, prefix_node,
                                                   ACPI_NS_NO_UPSEARCH, &node);
                 if (ACPI_FAILURE(status)) {
-                        acpi_os_printf
-                            ("report_method_error: Could not get node\n");
-                        return;
+                        acpi_os_printf("[Could not get node by pathname]");
                 }
         }
 
-        acpi_os_printf("%8s-%04d: *** Error: ", module_name, line_number);
         acpi_ns_print_node_pathname(node, message);
         acpi_os_printf(", %s\n", acpi_format_exception(method_status));
 }
@@ -248,11 +242,11 @@ acpi_object_type acpi_ns_get_type(struct acpi_namespace_node * node)
         ACPI_FUNCTION_TRACE("ns_get_type");
 
         if (!node) {
-                ACPI_REPORT_WARNING(("ns_get_type: Null Node input pointer\n"));
-                return_VALUE(ACPI_TYPE_ANY);
+                ACPI_WARNING((AE_INFO, "Null Node parameter"));
+                return_UINT32(ACPI_TYPE_ANY);
         }
 
-        return_VALUE((acpi_object_type) node->type);
+        return_UINT32((acpi_object_type) node->type);
 }
 
 /*******************************************************************************
@@ -275,11 +269,11 @@ u32 acpi_ns_local(acpi_object_type type)
         if (!acpi_ut_valid_object_type(type)) {
                 /* Type code out of range  */
 
-                ACPI_REPORT_WARNING(("ns_local: Invalid Object Type\n"));
-                return_VALUE(ACPI_NS_NORMAL);
+                ACPI_WARNING((AE_INFO, "Invalid Object Type %X", type));
+                return_UINT32(ACPI_NS_NORMAL);
         }
 
-        return_VALUE((u32) acpi_gbl_ns_properties[type] & ACPI_NS_LOCAL);
+        return_UINT32((u32) acpi_gbl_ns_properties[type] & ACPI_NS_LOCAL);
 }
 
 /*******************************************************************************
@@ -627,7 +621,7 @@ acpi_ns_externalize_name(u32 internal_name_length,
          * with internal_name (invalid format).
          */
         if (required_length > internal_name_length) {
-                ACPI_REPORT_ERROR(("ns_externalize_name: Invalid internal name\n"));
+                ACPI_ERROR((AE_INFO, "Invalid internal name"));
                 return_ACPI_STATUS(AE_BAD_PATHNAME);
         }
 
@@ -803,12 +797,11 @@ u32 acpi_ns_opens_scope(acpi_object_type type)
         if (!acpi_ut_valid_object_type(type)) {
                 /* type code out of range  */
 
-                ACPI_REPORT_WARNING(("ns_opens_scope: Invalid Object Type %X\n",
-                                     type));
-                return_VALUE(ACPI_NS_NORMAL);
+                ACPI_WARNING((AE_INFO, "Invalid Object Type %X", type));
+                return_UINT32(ACPI_NS_NORMAL);
         }
 
-        return_VALUE(((u32) acpi_gbl_ns_properties[type]) & ACPI_NS_NEWSCOPE);
+        return_UINT32(((u32) acpi_gbl_ns_properties[type]) & ACPI_NS_NEWSCOPE);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/namespace/nswalk.c b/drivers/acpi/namespace/nswalk.c
index 5f164c0df33b..fcab1e784b81 100644
--- a/drivers/acpi/namespace/nswalk.c
+++ b/drivers/acpi/namespace/nswalk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index c07b046659ff..a95f636dc35d 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -112,8 +112,7 @@ acpi_evaluate_object_typed(acpi_handle handle,
         if (return_buffer->length == 0) {
                 /* Error because caller specifically asked for a return value */
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "No return value\n"));
-
+                ACPI_ERROR((AE_INFO, "No return value"));
                 return_ACPI_STATUS(AE_NULL_OBJECT);
         }
 
@@ -125,11 +124,11 @@ acpi_evaluate_object_typed(acpi_handle handle,
 
         /* Return object type does not match requested type */
 
-        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                          "Incorrect return type [%s] requested [%s]\n",
-                          acpi_ut_get_type_name(((union acpi_object *)
-                                                 return_buffer->pointer)->type),
-                          acpi_ut_get_type_name(return_type)));
+        ACPI_ERROR((AE_INFO,
+                    "Incorrect return type [%s] requested [%s]",
+                    acpi_ut_get_type_name(((union acpi_object *)return_buffer->
+                                           pointer)->type),
+                    acpi_ut_get_type_name(return_type)));
 
         if (must_free) {
                 /* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */
@@ -236,11 +235,11 @@ acpi_evaluate_object(acpi_handle handle,
                  * qualified names above, this is an error
                  */
                 if (!pathname) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Both Handle and Pathname are NULL\n"));
+                        ACPI_ERROR((AE_INFO,
+                                    "Both Handle and Pathname are NULL"));
                 } else {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Handle is NULL and Pathname is relative\n"));
+                        ACPI_ERROR((AE_INFO,
+                                    "Handle is NULL and Pathname is relative"));
                 }
 
                 status = AE_BAD_PARAMETER;
@@ -399,7 +398,7 @@ acpi_walk_namespace(acpi_object_type type,
 
         /* Parameter validation */
 
-        if ((type > ACPI_TYPE_EXTERNAL_MAX) || (!max_depth) || (!user_function)) {
+        if ((type > ACPI_TYPE_LOCAL_MAX) || (!max_depth) || (!user_function)) {
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
@@ -473,8 +472,8 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
                 return (AE_CTRL_DEPTH);
         }
 
-        if (!(flags & 0x01)) {
-                /* Don't return at the device or children of the device if not there */
+        if (!(flags & ACPI_STA_DEVICE_PRESENT)) {
+                /* Don't examine children of the device if not present */
 
                 return (AE_CTRL_DEPTH);
         }
diff --git a/drivers/acpi/namespace/nsxfname.c b/drivers/acpi/namespace/nsxfname.c
index 6b5f8d4481d1..8cd8675a47c0 100644
--- a/drivers/acpi/namespace/nsxfname.c
+++ b/drivers/acpi/namespace/nsxfname.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -300,8 +300,7 @@ acpi_get_object_info(acpi_handle handle, struct acpi_buffer * buffer)
 
                 status = acpi_ut_execute_CID(node, &cid_list);
                 if (ACPI_SUCCESS(status)) {
-                        size += ((acpi_size) cid_list->count - 1) *
-                            sizeof(struct acpi_compatible_id);
+                        size += cid_list->size;
                         info->valid |= ACPI_VALID_CID;
                 }
 
diff --git a/drivers/acpi/namespace/nsxfobj.c b/drivers/acpi/namespace/nsxfobj.c
index 0856d42e6909..a0332595677a 100644
--- a/drivers/acpi/namespace/nsxfobj.c
+++ b/drivers/acpi/namespace/nsxfobj.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without