Pull ia64-mutex-primitives into release branch

[powerpc.git] / drivers / acpi / namespace / nssearch.c

diff --git a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/namespace/nssearch.c
index 50a3ca5..d64b789 100644 (file)
--- 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);
        }