Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git] / drivers / acpi / namespace / nsutils.c
index c53b82e..aa4e799 100644 (file)
@@ -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
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <acpi/acpi.h>
 #include <acpi/acnamesp.h>
 #include <acpi/amlcode.h>
 #include <acpi/actables.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
-        ACPI_MODULE_NAME    ("nsutils")
+ACPI_MODULE_NAME("nsutils")
 
 /* Local prototypes */
-
-static u8
-acpi_ns_valid_path_separator (
-       char                            sep);
+static u8 acpi_ns_valid_path_separator(char sep);
 
 #ifdef ACPI_OBSOLETE_FUNCTIONS
-acpi_name
-acpi_ns_find_parent_name (
-       struct acpi_namespace_node      *node_to_search);
+acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node *node_to_search);
 #endif
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_report_error
  *
  * 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
  *
@@ -81,61 +73,54 @@ acpi_ns_find_parent_name (
  ******************************************************************************/
 
 void
-acpi_ns_report_error (
-       char                            *module_name,
-       u32                             line_number,
-       u32                             component_id,
-       char                            *internal_name,
-       acpi_status                     lookup_status)
+acpi_ns_report_error(char *module_name,
+                    u32 line_number,
+                    char *internal_name, acpi_status lookup_status)
 {
-       acpi_status                     status;
-       char                            *name = NULL;
+       acpi_status status;
+       u32 bad_name;
+       char *name = NULL;
 
-
-       acpi_os_printf ("%8s-%04d: *** Error: Looking up ",
-               module_name, line_number);
+       acpi_os_printf("ACPI Error (%s-%04d): ", 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_CAST_PTR (u32, internal_name)));
-       }
-       else {
+               ACPI_MOVE_32_TO_32(&bad_name, internal_name);
+               acpi_os_printf("[0x%4.4X] (NON-ASCII)", bad_name);
+       } else {
                /* Convert path to external format */
 
-               status = acpi_ns_externalize_name (ACPI_UINT32_MAX,
-                                internal_name, NULL, &name);
+               status = acpi_ns_externalize_name(ACPI_UINT32_MAX,
+                                                 internal_name, NULL, &name);
 
                /* Print target name */
 
-               if (ACPI_SUCCESS (status)) {
-                       acpi_os_printf ("[%s]", name);
-               }
-               else {
-                       acpi_os_printf ("[COULD NOT EXTERNALIZE NAME]");
+               if (ACPI_SUCCESS(status)) {
+                       acpi_os_printf("[%s]", name);
+               } else {
+                       acpi_os_printf("[COULD NOT EXTERNALIZE NAME]");
                }
 
                if (name) {
-                       ACPI_MEM_FREE (name);
+                       ACPI_FREE(name);
                }
        }
 
-       acpi_os_printf (" in namespace, %s\n",
-               acpi_format_exception (lookup_status));
+       acpi_os_printf(" Namespace lookup failure, %s\n",
+                      acpi_format_exception(lookup_status));
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_report_method_error
  *
  * 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
@@ -145,34 +130,30 @@ acpi_ns_report_error (
  ******************************************************************************/
 
 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)
+acpi_ns_report_method_error(char *module_name,
+                           u32 line_number,
+                           char *message,
+                           struct acpi_namespace_node *prefix_node,
+                           char *path, acpi_status method_status)
 {
-       acpi_status                     status;
-       struct acpi_namespace_node      *node = prefix_node;
+       acpi_status status;
+       struct acpi_namespace_node *node = prefix_node;
 
+       acpi_os_printf("ACPI Error (%s-%04d): ", 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;
+               status =
+                   acpi_ns_get_node(prefix_node, path, ACPI_NS_NO_UPSEARCH,
+                                    &node);
+               if (ACPI_FAILURE(status)) {
+                       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));
+       acpi_ns_print_node_pathname(node, message);
+       acpi_os_printf(", %s\n", acpi_format_exception(method_status));
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_print_node_pathname
@@ -186,16 +167,13 @@ acpi_ns_report_method_error (
  ******************************************************************************/
 
 void
-acpi_ns_print_node_pathname (
-       struct acpi_namespace_node      *node,
-       char                            *message)
+acpi_ns_print_node_pathname(struct acpi_namespace_node *node, char *message)
 {
-       struct acpi_buffer              buffer;
-       acpi_status                     status;
-
+       struct acpi_buffer buffer;
+       acpi_status status;
 
        if (!node) {
-               acpi_os_printf ("[NULL NAME]");
+               acpi_os_printf("[NULL NAME]");
                return;
        }
 
@@ -203,18 +181,17 @@ acpi_ns_print_node_pathname (
 
        buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;
 
-       status = acpi_ns_handle_to_pathname (node, &buffer);
-       if (ACPI_SUCCESS (status)) {
+       status = acpi_ns_handle_to_pathname(node, &buffer);
+       if (ACPI_SUCCESS(status)) {
                if (message) {
-                       acpi_os_printf ("%s ", message);
+                       acpi_os_printf("%s ", message);
                }
 
-               acpi_os_printf ("[%s] (Node %p)", (char *) buffer.pointer, node);
-               ACPI_MEM_FREE (buffer.pointer);
+               acpi_os_printf("[%s] (Node %p)", (char *)buffer.pointer, node);
+               ACPI_FREE(buffer.pointer);
        }
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_valid_root_prefix
@@ -227,15 +204,12 @@ acpi_ns_print_node_pathname (
  *
  ******************************************************************************/
 
-u8
-acpi_ns_valid_root_prefix (
-       char                            prefix)
+u8 acpi_ns_valid_root_prefix(char prefix)
 {
 
        return ((u8) (prefix == '\\'));
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_valid_path_separator
@@ -248,15 +222,12 @@ acpi_ns_valid_root_prefix (
  *
  ******************************************************************************/
 
-static u8
-acpi_ns_valid_path_separator (
-       char                            sep)
+static u8 acpi_ns_valid_path_separator(char sep)
 {
 
        return ((u8) (sep == '.'));
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_get_type
@@ -269,22 +240,18 @@ acpi_ns_valid_path_separator (
  *
  ******************************************************************************/
 
-acpi_object_type
-acpi_ns_get_type (
-       struct acpi_namespace_node      *node)
+acpi_object_type acpi_ns_get_type(struct acpi_namespace_node * node)
 {
-       ACPI_FUNCTION_TRACE ("ns_get_type");
-
+       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);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_local
@@ -298,24 +265,21 @@ acpi_ns_get_type (
  *
  ******************************************************************************/
 
-u32
-acpi_ns_local (
-       acpi_object_type                type)
+u32 acpi_ns_local(acpi_object_type type)
 {
-       ACPI_FUNCTION_TRACE ("ns_local");
+       ACPI_FUNCTION_TRACE(ns_local);
 
+       if (!acpi_ut_valid_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);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_get_internal_name_length
@@ -330,16 +294,12 @@ acpi_ns_local (
  *
  ******************************************************************************/
 
-void
-acpi_ns_get_internal_name_length (
-       struct acpi_namestring_info     *info)
+void acpi_ns_get_internal_name_length(struct acpi_namestring_info *info)
 {
-       char                            *next_external_char;
-       u32                             i;
-
-
-       ACPI_FUNCTION_ENTRY ();
+       char *next_external_char;
+       u32 i;
 
+       ACPI_FUNCTION_ENTRY();
 
        next_external_char = info->external_name;
        info->num_carats = 0;
@@ -353,11 +313,10 @@ acpi_ns_get_internal_name_length (
         *
         * strlen() + 1 covers the first name_seg, which has no path separator
         */
-       if (acpi_ns_valid_root_prefix (next_external_char[0])) {
+       if (acpi_ns_valid_root_prefix(next_external_char[0])) {
                info->fully_qualified = TRUE;
                next_external_char++;
-       }
-       else {
+       } else {
                /*
                 * Handle Carat prefixes
                 */
@@ -375,19 +334,18 @@ acpi_ns_get_internal_name_length (
        if (*next_external_char) {
                info->num_segments = 1;
                for (i = 0; next_external_char[i]; i++) {
-                       if (acpi_ns_valid_path_separator (next_external_char[i])) {
+                       if (acpi_ns_valid_path_separator(next_external_char[i])) {
                                info->num_segments++;
                        }
                }
        }
 
        info->length = (ACPI_NAME_SIZE * info->num_segments) +
-                         4 + info->num_carats;
+           4 + info->num_carats;
 
        info->next_external_char = next_external_char;
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_build_internal_name
@@ -401,19 +359,15 @@ acpi_ns_get_internal_name_length (
  *
  ******************************************************************************/
 
-acpi_status
-acpi_ns_build_internal_name (
-       struct acpi_namestring_info     *info)
+acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info)
 {
-       u32                             num_segments = info->num_segments;
-       char                            *internal_name = info->internal_name;
-       char                            *external_name = info->next_external_char;
-       char                            *result = NULL;
-       acpi_native_uint                i;
-
-
-       ACPI_FUNCTION_TRACE ("ns_build_internal_name");
+       u32 num_segments = info->num_segments;
+       char *internal_name = info->internal_name;
+       char *external_name = info->next_external_char;
+       char *result = NULL;
+       acpi_native_uint i;
 
+       ACPI_FUNCTION_TRACE(ns_build_internal_name);
 
        /* Setup the correct prefixes, counts, and pointers */
 
@@ -422,18 +376,15 @@ acpi_ns_build_internal_name (
 
                if (num_segments <= 1) {
                        result = &internal_name[1];
-               }
-               else if (num_segments == 2) {
+               } else if (num_segments == 2) {
                        internal_name[1] = AML_DUAL_NAME_PREFIX;
                        result = &internal_name[2];
-               }
-               else {
+               } else {
                        internal_name[1] = AML_MULTI_NAME_PREFIX_OP;
-                       internal_name[2] = (char) num_segments;
+                       internal_name[2] = (char)num_segments;
                        result = &internal_name[3];
                }
-       }
-       else {
+       } else {
                /*
                 * Not fully qualified.
                 * Handle Carats first, then append the name segments
@@ -447,15 +398,14 @@ acpi_ns_build_internal_name (
 
                if (num_segments <= 1) {
                        result = &internal_name[i];
-               }
-               else if (num_segments == 2) {
+               } else if (num_segments == 2) {
                        internal_name[i] = AML_DUAL_NAME_PREFIX;
-                       result = &internal_name[(acpi_native_uint) (i+1)];
-               }
-               else {
+                       result = &internal_name[(acpi_native_uint) (i + 1)];
+               } else {
                        internal_name[i] = AML_MULTI_NAME_PREFIX_OP;
-                       internal_name[(acpi_native_uint) (i+1)] = (char) num_segments;
-                       result = &internal_name[(acpi_native_uint) (i+2)];
+                       internal_name[(acpi_native_uint) (i + 1)] =
+                           (char)num_segments;
+                       result = &internal_name[(acpi_native_uint) (i + 2)];
                }
        }
 
@@ -463,25 +413,26 @@ acpi_ns_build_internal_name (
 
        for (; num_segments; num_segments--) {
                for (i = 0; i < ACPI_NAME_SIZE; i++) {
-                       if (acpi_ns_valid_path_separator (*external_name) ||
-                          (*external_name == 0)) {
+                       if (acpi_ns_valid_path_separator(*external_name) ||
+                           (*external_name == 0)) {
+
                                /* Pad the segment with underscore(s) if segment is short */
 
                                result[i] = '_';
-                       }
-                       else {
+                       } else {
                                /* Convert the character to uppercase and save it */
 
-                               result[i] = (char) ACPI_TOUPPER ((int) *external_name);
+                               result[i] =
+                                   (char)ACPI_TOUPPER((int)*external_name);
                                external_name++;
                        }
                }
 
                /* Now we must have a path separator, or the pathname is bad */
 
-               if (!acpi_ns_valid_path_separator (*external_name) &&
-                       (*external_name != 0)) {
-                       return_ACPI_STATUS (AE_BAD_PARAMETER);
+               if (!acpi_ns_valid_path_separator(*external_name) &&
+                   (*external_name != 0)) {
+                       return_ACPI_STATUS(AE_BAD_PARAMETER);
                }
 
                /* Move on the next segment */
@@ -495,18 +446,17 @@ acpi_ns_build_internal_name (
        *result = 0;
 
        if (info->fully_qualified) {
-               ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Returning [%p] (abs) \"\\%s\"\n",
-                       internal_name, internal_name));
-       }
-       else {
-               ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Returning [%p] (rel) \"%s\"\n",
-                       internal_name, internal_name));
+               ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                 "Returning [%p] (abs) \"\\%s\"\n",
+                                 internal_name, internal_name));
+       else {
+               ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Returning [%p] (rel) \"%s\"\n",
+                                 internal_name, internal_name));
        }
 
-       return_ACPI_STATUS (AE_OK);
+       return_ACPI_STATUS(AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_internalize_name
@@ -522,51 +472,43 @@ acpi_ns_build_internal_name (
  *
  *******************************************************************************/
 
-acpi_status
-acpi_ns_internalize_name (
-       char                            *external_name,
-       char                            **converted_name)
+acpi_status acpi_ns_internalize_name(char *external_name, char **converted_name)
 {
-       char                            *internal_name;
-       struct acpi_namestring_info     info;
-       acpi_status                     status;
-
+       char *internal_name;
+       struct acpi_namestring_info info;
+       acpi_status status;
 
-       ACPI_FUNCTION_TRACE ("ns_internalize_name");
+       ACPI_FUNCTION_TRACE(ns_internalize_name);
 
-
-       if ((!external_name)     ||
-               (*external_name == 0) ||
-               (!converted_name)) {
-               return_ACPI_STATUS (AE_BAD_PARAMETER);
+       if ((!external_name) || (*external_name == 0) || (!converted_name)) {
+               return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
        /* Get the length of the new internal name */
 
        info.external_name = external_name;
-       acpi_ns_get_internal_name_length (&info);
+       acpi_ns_get_internal_name_length(&info);
 
        /* We need a segment to store the internal  name */
 
-       internal_name = ACPI_MEM_CALLOCATE (info.length);
+       internal_name = ACPI_ALLOCATE_ZEROED(info.length);
        if (!internal_name) {
-               return_ACPI_STATUS (AE_NO_MEMORY);
+               return_ACPI_STATUS(AE_NO_MEMORY);
        }
 
        /* Build the name */
 
        info.internal_name = internal_name;
-       status = acpi_ns_build_internal_name (&info);
-       if (ACPI_FAILURE (status)) {
-               ACPI_MEM_FREE (internal_name);
-               return_ACPI_STATUS (status);
+       status = acpi_ns_build_internal_name(&info);
+       if (ACPI_FAILURE(status)) {
+               ACPI_FREE(internal_name);
+               return_ACPI_STATUS(status);
        }
 
        *converted_name = internal_name;
-       return_ACPI_STATUS (AE_OK);
+       return_ACPI_STATUS(AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_externalize_name
@@ -585,27 +527,21 @@ acpi_ns_internalize_name (
  ******************************************************************************/
 
 acpi_status
-acpi_ns_externalize_name (
-       u32                             internal_name_length,
-       char                            *internal_name,
-       u32                             *converted_name_length,
-       char                            **converted_name)
+acpi_ns_externalize_name(u32 internal_name_length,
+                        char *internal_name,
+                        u32 * converted_name_length, char **converted_name)
 {
-       acpi_native_uint                names_index = 0;
-       acpi_native_uint                num_segments = 0;
-       acpi_native_uint                required_length;
-       acpi_native_uint                prefix_length = 0;
-       acpi_native_uint                i = 0;
-       acpi_native_uint                j = 0;
-
+       acpi_native_uint names_index = 0;
+       acpi_native_uint num_segments = 0;
+       acpi_native_uint required_length;
+       acpi_native_uint prefix_length = 0;
+       acpi_native_uint i = 0;
+       acpi_native_uint j = 0;
 
-       ACPI_FUNCTION_TRACE ("ns_externalize_name");
+       ACPI_FUNCTION_TRACE(ns_externalize_name);
 
-
-       if (!internal_name_length   ||
-               !internal_name          ||
-               !converted_name) {
-               return_ACPI_STATUS (AE_BAD_PARAMETER);
+       if (!internal_name_length || !internal_name || !converted_name) {
+               return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
        /*
@@ -620,8 +556,7 @@ acpi_ns_externalize_name (
                for (i = 0; i < internal_name_length; i++) {
                        if (internal_name[i] == '^') {
                                prefix_length = i + 1;
-                       }
-                       else {
+                       } else {
                                break;
                        }
                }
@@ -648,7 +583,8 @@ acpi_ns_externalize_name (
 
                        names_index = prefix_length + 2;
                        num_segments = (acpi_native_uint) (u8)
-                                          internal_name[(acpi_native_uint) (prefix_length + 1)];
+                           internal_name[(acpi_native_uint)
+                                         (prefix_length + 1)];
                        break;
 
                case AML_DUAL_NAME_PREFIX:
@@ -683,23 +619,23 @@ acpi_ns_externalize_name (
         * punctuation ('.') between object names, plus the NULL terminator.
         */
        required_length = prefix_length + (4 * num_segments) +
-                          ((num_segments > 0) ? (num_segments - 1) : 0) + 1;
+           ((num_segments > 0) ? (num_segments - 1) : 0) + 1;
 
        /*
         * Check to see if we're still in bounds.  If not, there's a problem
         * with internal_name (invalid format).
         */
        if (required_length > internal_name_length) {
-               ACPI_REPORT_ERROR (("ns_externalize_name: Invalid internal name\n"));
-               return_ACPI_STATUS (AE_BAD_PATHNAME);
+               ACPI_ERROR((AE_INFO, "Invalid internal name"));
+               return_ACPI_STATUS(AE_BAD_PATHNAME);
        }
 
        /*
         * Build converted_name
         */
-       *converted_name = ACPI_MEM_CALLOCATE (required_length);
+       *converted_name = ACPI_ALLOCATE_ZEROED(required_length);
        if (!(*converted_name)) {
-               return_ACPI_STATUS (AE_NO_MEMORY);
+               return_ACPI_STATUS(AE_NO_MEMORY);
        }
 
        j = 0;
@@ -725,10 +661,9 @@ acpi_ns_externalize_name (
                *converted_name_length = (u32) required_length;
        }
 
-       return_ACPI_STATUS (AE_OK);
+       return_ACPI_STATUS(AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_map_handle_to_node
@@ -745,35 +680,27 @@ acpi_ns_externalize_name (
  *
  ******************************************************************************/
 
-struct acpi_namespace_node *
-acpi_ns_map_handle_to_node (
-       acpi_handle                     handle)
+struct acpi_namespace_node *acpi_ns_map_handle_to_node(acpi_handle handle)
 {
 
-       ACPI_FUNCTION_ENTRY ();
-
+       ACPI_FUNCTION_ENTRY();
 
        /*
-        * Simple implementation.
+        * Simple implementation
         */
-       if (!handle) {
-               return (NULL);
-       }
-
-       if (handle == ACPI_ROOT_OBJECT) {
+       if ((!handle) || (handle == ACPI_ROOT_OBJECT)) {
                return (acpi_gbl_root_node);
        }
 
        /* We can at least attempt to verify the handle */
 
-       if (ACPI_GET_DESCRIPTOR_TYPE (handle) != ACPI_DESC_TYPE_NAMED) {
+       if (ACPI_GET_DESCRIPTOR_TYPE(handle) != ACPI_DESC_TYPE_NAMED) {
                return (NULL);
        }
 
-       return ((struct acpi_namespace_node *) handle);
+       return (ACPI_CAST_PTR(struct acpi_namespace_node, handle));
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_convert_entry_to_handle
@@ -786,18 +713,14 @@ acpi_ns_map_handle_to_node (
  *
  ******************************************************************************/
 
-acpi_handle
-acpi_ns_convert_entry_to_handle (
-       struct acpi_namespace_node          *node)
+acpi_handle acpi_ns_convert_entry_to_handle(struct acpi_namespace_node *node)
 {
 
-
        /*
         * Simple implementation for now;
         */
        return ((acpi_handle) node);
 
-
 /* Example future implementation ---------------------
 
        if (!Node)
@@ -810,12 +733,10 @@ acpi_ns_convert_entry_to_handle (
                return (ACPI_ROOT_OBJECT);
        }
 
-
        return ((acpi_handle) Node);
 ------------------------------------------------------*/
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_terminate
@@ -828,42 +749,37 @@ acpi_ns_convert_entry_to_handle (
  *
  ******************************************************************************/
 
-void
-acpi_ns_terminate (
-       void)
+void acpi_ns_terminate(void)
 {
-       union acpi_operand_object       *obj_desc;
-
-
-       ACPI_FUNCTION_TRACE ("ns_terminate");
+       union acpi_operand_object *obj_desc;
 
+       ACPI_FUNCTION_TRACE(ns_terminate);
 
        /*
         * 1) Free the entire namespace -- all nodes and objects
         *
         * Delete all object descriptors attached to namepsace nodes
         */
-       acpi_ns_delete_namespace_subtree (acpi_gbl_root_node);
+       acpi_ns_delete_namespace_subtree(acpi_gbl_root_node);
 
        /* Detach any objects attached to the root */
 
-       obj_desc = acpi_ns_get_attached_object (acpi_gbl_root_node);
+       obj_desc = acpi_ns_get_attached_object(acpi_gbl_root_node);
        if (obj_desc) {
-               acpi_ns_detach_object (acpi_gbl_root_node);
+               acpi_ns_detach_object(acpi_gbl_root_node);
        }
 
-       ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Namespace freed\n"));
+       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Namespace freed\n"));
 
        /*
         * 2) Now we can delete the ACPI tables
         */
-       acpi_tb_delete_all_tables ();
-       ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "ACPI Tables freed\n"));
+       acpi_tb_delete_all_tables();
+       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "ACPI Tables freed\n"));
 
        return_VOID;
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_opens_scope
@@ -875,32 +791,29 @@ acpi_ns_terminate (
  *
  ******************************************************************************/
 
-u32
-acpi_ns_opens_scope (
-       acpi_object_type                type)
+u32 acpi_ns_opens_scope(acpi_object_type type)
 {
-       ACPI_FUNCTION_TRACE_STR ("ns_opens_scope", acpi_ut_get_type_name (type));
+       ACPI_FUNCTION_TRACE_STR(ns_opens_scope, acpi_ut_get_type_name(type));
 
+       if (!acpi_ut_valid_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);
 }
 
-
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ns_get_node_by_path
+ * FUNCTION:    acpi_ns_get_node
  *
  * PARAMETERS:  *Pathname   - Name to be found, in external (ASL) format. The
  *                            \ (backslash) and ^ (carat) prefixes, and the
  *                            . (period) to separate segments are supported.
- *              start_node  - Root of subtree to be searched, or NS_ALL for the
+ *              prefix_node  - Root of subtree to be searched, or NS_ALL for the
  *                            root of the name space.  If Name is fully
  *                            qualified (first s8 is '\'), the passed value
  *                            of Scope will not be accessed.
@@ -916,61 +829,60 @@ acpi_ns_opens_scope (
  ******************************************************************************/
 
 acpi_status
-acpi_ns_get_node_by_path (
-       char                            *pathname,
-       struct acpi_namespace_node      *start_node,
-       u32                             flags,
-       struct acpi_namespace_node      **return_node)
+acpi_ns_get_node(struct acpi_namespace_node *prefix_node,
+                char *pathname,
+                u32 flags, struct acpi_namespace_node **return_node)
 {
-       union acpi_generic_state        scope_info;
-       acpi_status                     status;
-       char                            *internal_path = NULL;
+       union acpi_generic_state scope_info;
+       acpi_status status;
+       char *internal_path;
 
+       ACPI_FUNCTION_TRACE_PTR(ns_get_node, pathname);
 
-       ACPI_FUNCTION_TRACE_PTR ("ns_get_node_by_path", pathname);
-
+       if (!pathname) {
+               *return_node = prefix_node;
+               if (!prefix_node) {
+                       *return_node = acpi_gbl_root_node;
+               }
+               return_ACPI_STATUS(AE_OK);
+       }
 
-       if (pathname) {
-               /* Convert path to internal representation */
+       /* Convert path to internal representation */
 
-               status = acpi_ns_internalize_name (pathname, &internal_path);
-               if (ACPI_FAILURE (status)) {
-                       return_ACPI_STATUS (status);
-               }
+       status = acpi_ns_internalize_name(pathname, &internal_path);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
        }
 
        /* Must lock namespace during lookup */
 
-       status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
-       if (ACPI_FAILURE (status)) {
+       status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+       if (ACPI_FAILURE(status)) {
                goto cleanup;
        }
 
        /* Setup lookup scope (search starting point) */
 
-       scope_info.scope.node = start_node;
+       scope_info.scope.node = prefix_node;
 
        /* Lookup the name in the namespace */
 
-       status = acpi_ns_lookup (&scope_info, internal_path,
-                        ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE,
-                        (flags | ACPI_NS_DONT_OPEN_SCOPE),
-                        NULL, return_node);
-       if (ACPI_FAILURE (status)) {
-               ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "%s, %s\n",
-                               internal_path, acpi_format_exception (status)));
+       status = acpi_ns_lookup(&scope_info, internal_path, ACPI_TYPE_ANY,
+                               ACPI_IMODE_EXECUTE,
+                               (flags | ACPI_NS_DONT_OPEN_SCOPE), NULL,
+                               return_node);
+       if (ACPI_FAILURE(status)) {
+               ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s, %s\n",
+                                 pathname, acpi_format_exception(status)));
        }
 
-       (void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
+       (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
 
-cleanup:
-       if (internal_path) {
-               ACPI_MEM_FREE (internal_path);
-       }
-       return_ACPI_STATUS (status);
+      cleanup:
+       ACPI_FREE(internal_path);
+       return_ACPI_STATUS(status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_get_parent_node
@@ -983,12 +895,10 @@ cleanup:
  *
  ******************************************************************************/
 
-struct acpi_namespace_node *
-acpi_ns_get_parent_node (
-       struct acpi_namespace_node      *node)
+struct acpi_namespace_node *acpi_ns_get_parent_node(struct acpi_namespace_node
+                                                   *node)
 {
-       ACPI_FUNCTION_ENTRY ();
-
+       ACPI_FUNCTION_ENTRY();
 
        if (!node) {
                return (NULL);
@@ -1006,7 +916,6 @@ acpi_ns_get_parent_node (
        return (node->peer);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_get_next_valid_node
@@ -1021,9 +930,9 @@ acpi_ns_get_parent_node (
  *
  ******************************************************************************/
 
-struct acpi_namespace_node *
-acpi_ns_get_next_valid_node (
-       struct acpi_namespace_node      *node)
+struct acpi_namespace_node *acpi_ns_get_next_valid_node(struct
+                                                       acpi_namespace_node
+                                                       *node)
 {
 
        /* If we are at the end of this peer list, return NULL */
@@ -1037,7 +946,6 @@ acpi_ns_get_next_valid_node (
        return (node->peer);
 }
 
-
 #ifdef ACPI_OBSOLETE_FUNCTIONS
 /*******************************************************************************
  *
@@ -1053,38 +961,37 @@ acpi_ns_get_next_valid_node (
  *
  ******************************************************************************/
 
-acpi_name
-acpi_ns_find_parent_name (
-       struct acpi_namespace_node      *child_node)
+acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node * child_node)
 {
-       struct acpi_namespace_node      *parent_node;
-
-
-       ACPI_FUNCTION_TRACE ("ns_find_parent_name");
+       struct acpi_namespace_node *parent_node;
 
+       ACPI_FUNCTION_TRACE(ns_find_parent_name);
 
        if (child_node) {
+
                /* Valid entry.  Get the parent Node */
 
-               parent_node = acpi_ns_get_parent_node (child_node);
+               parent_node = acpi_ns_get_parent_node(child_node);
                if (parent_node) {
-                       ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
-                               "Parent of %p [%4.4s] is %p [%4.4s]\n",
-                               child_node, acpi_ut_get_node_name (child_node),
-                               parent_node, acpi_ut_get_node_name (parent_node)));
+                       ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                         "Parent of %p [%4.4s] is %p [%4.4s]\n",
+                                         child_node,
+                                         acpi_ut_get_node_name(child_node),
+                                         parent_node,
+                                         acpi_ut_get_node_name(parent_node)));
 
                        if (parent_node->name.integer) {
-                               return_VALUE ((acpi_name) parent_node->name.integer);
+                               return_VALUE((acpi_name) parent_node->name.
+                                            integer);
                        }
                }
 
-               ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
-                       "Unable to find parent of %p (%4.4s)\n",
-                       child_node, acpi_ut_get_node_name (child_node)));
+               ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                 "Unable to find parent of %p (%4.4s)\n",
+                                 child_node,
+                                 acpi_ut_get_node_name(child_node)));
        }
 
-       return_VALUE (ACPI_UNKNOWN_NAME);
+       return_VALUE(ACPI_UNKNOWN_NAME);
 }
 #endif
-
-