Merge branch 'origin'
[pandora-kernel.git] / drivers / acpi / namespace / nsxfeval.c
index 12ea202..a95f636 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
 #include <acpi/acnamesp.h>
 #include <acpi/acinterp.h>
 
-
 #define _COMPONENT          ACPI_NAMESPACE
-        ACPI_MODULE_NAME    ("nsxfeval")
-
+ACPI_MODULE_NAME("nsxfeval")
 
 /*******************************************************************************
  *
  *              be valid (non-null)
  *
  ******************************************************************************/
-
 #ifdef ACPI_FUTURE_USAGE
 acpi_status
-acpi_evaluate_object_typed (
-       acpi_handle                     handle,
-       acpi_string                     pathname,
-       struct acpi_object_list         *external_params,
-       struct acpi_buffer              *return_buffer,
-       acpi_object_type                return_type)
+acpi_evaluate_object_typed(acpi_handle handle,
+                          acpi_string pathname,
+                          struct acpi_object_list *external_params,
+                          struct acpi_buffer *return_buffer,
+                          acpi_object_type return_type)
 {
-       acpi_status                     status;
-       u8                              must_free = FALSE;
-
-
-       ACPI_FUNCTION_TRACE ("acpi_evaluate_object_typed");
+       acpi_status status;
+       u8 must_free = FALSE;
 
+       ACPI_FUNCTION_TRACE("acpi_evaluate_object_typed");
 
        /* Return buffer must be valid */
 
        if (!return_buffer) {
-               return_ACPI_STATUS (AE_BAD_PARAMETER);
+               return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
        if (return_buffer->length == ACPI_ALLOCATE_BUFFER) {
@@ -102,51 +96,51 @@ acpi_evaluate_object_typed (
 
        /* Evaluate the object */
 
-       status = acpi_evaluate_object (handle, pathname, external_params, return_buffer);
-       if (ACPI_FAILURE (status)) {
-               return_ACPI_STATUS (status);
+       status =
+           acpi_evaluate_object(handle, pathname, external_params,
+                                return_buffer);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
        }
 
        /* Type ANY means "don't care" */
 
        if (return_type == ACPI_TYPE_ANY) {
-               return_ACPI_STATUS (AE_OK);
+               return_ACPI_STATUS(AE_OK);
        }
 
        if (return_buffer->length == 0) {
                /* Error because caller specifically asked for a return value */
 
-               ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                       "No return value\n"));
-
-               return_ACPI_STATUS (AE_NULL_OBJECT);
+               ACPI_ERROR((AE_INFO, "No return value"));
+               return_ACPI_STATUS(AE_NULL_OBJECT);
        }
 
        /* Examine the object type returned from evaluate_object */
 
-       if (((union acpi_object *) return_buffer->pointer)->type == return_type) {
-               return_ACPI_STATUS (AE_OK);
+       if (((union acpi_object *)return_buffer->pointer)->type == return_type) {
+               return_ACPI_STATUS(AE_OK);
        }
 
        /* 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 */
 
-               acpi_os_free (return_buffer->pointer);
+               acpi_os_free(return_buffer->pointer);
                return_buffer->pointer = NULL;
        }
 
        return_buffer->length = 0;
-       return_ACPI_STATUS (AE_TYPE);
+       return_ACPI_STATUS(AE_TYPE);
 }
-#endif  /*  ACPI_FUTURE_USAGE  */
-
+#endif                         /*  ACPI_FUTURE_USAGE  */
 
 /*******************************************************************************
  *
@@ -169,21 +163,18 @@ acpi_evaluate_object_typed (
  ******************************************************************************/
 
 acpi_status
-acpi_evaluate_object (
-       acpi_handle                     handle,
-       acpi_string                     pathname,
-       struct acpi_object_list         *external_params,
-       struct acpi_buffer              *return_buffer)
+acpi_evaluate_object(acpi_handle handle,
+                    acpi_string pathname,
+                    struct acpi_object_list *external_params,
+                    struct acpi_buffer *return_buffer)
 {
-       acpi_status                     status;
-       acpi_status                     status2;
-       struct acpi_parameter_info      info;
-       acpi_size                       buffer_space_needed;
-       u32                             i;
-
-
-       ACPI_FUNCTION_TRACE ("acpi_evaluate_object");
+       acpi_status status;
+       acpi_status status2;
+       struct acpi_parameter_info info;
+       acpi_size buffer_space_needed;
+       u32 i;
 
+       ACPI_FUNCTION_TRACE("acpi_evaluate_object");
 
        info.node = handle;
        info.parameters = NULL;
@@ -200,11 +191,11 @@ acpi_evaluate_object (
                 * Allocate a new parameter block for the internal objects
                 * Add 1 to count to allow for null terminated internal list
                 */
-               info.parameters = ACPI_MEM_CALLOCATE (
-                                ((acpi_size) external_params->count + 1) *
-                                sizeof (void *));
+               info.parameters = ACPI_MEM_CALLOCATE(((acpi_size)
+                                                     external_params->count +
+                                                     1) * sizeof(void *));
                if (!info.parameters) {
-                       return_ACPI_STATUS (AE_NO_MEMORY);
+                       return_ACPI_STATUS(AE_NO_MEMORY);
                }
 
                /*
@@ -212,48 +203,47 @@ acpi_evaluate_object (
                 * internal object
                 */
                for (i = 0; i < external_params->count; i++) {
-                       status = acpi_ut_copy_eobject_to_iobject (&external_params->pointer[i],
-                                         &info.parameters[i]);
-                       if (ACPI_FAILURE (status)) {
-                               acpi_ut_delete_internal_object_list (info.parameters);
-                               return_ACPI_STATUS (status);
+                       status =
+                           acpi_ut_copy_eobject_to_iobject(&external_params->
+                                                           pointer[i],
+                                                           &info.
+                                                           parameters[i]);
+                       if (ACPI_FAILURE(status)) {
+                               acpi_ut_delete_internal_object_list(info.
+                                                                   parameters);
+                               return_ACPI_STATUS(status);
                        }
                }
                info.parameters[external_params->count] = NULL;
        }
 
-
        /*
         * Three major cases:
         * 1) Fully qualified pathname
         * 2) No handle, not fully qualified pathname (error)
         * 3) Valid handle
         */
-       if ((pathname) &&
-               (acpi_ns_valid_root_prefix (pathname[0]))) {
+       if ((pathname) && (acpi_ns_valid_root_prefix(pathname[0]))) {
                /*
                 *  The path is fully qualified, just evaluate by name
                 */
-               status = acpi_ns_evaluate_by_name (pathname, &info);
-       }
-       else if (!handle) {
+               status = acpi_ns_evaluate_by_name(pathname, &info);
+       } else if (!handle) {
                /*
                 * A handle is optional iff a fully qualified pathname
                 * is specified.  Since we've already handled fully
                 * qualified names above, this is an error
                 */
                if (!pathname) {
-                       ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                               "Both Handle and Pathname are NULL\n"));
-               }
-               else {
-                       ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                               "Handle is NULL and Pathname is relative\n"));
+                       ACPI_ERROR((AE_INFO,
+                                   "Both Handle and Pathname are NULL"));
+               } else {
+                       ACPI_ERROR((AE_INFO,
+                                   "Handle is NULL and Pathname is relative"));
                }
 
                status = AE_BAD_PARAMETER;
-       }
-       else {
+       } else {
                /*
                 * We get here if we have a handle -- and if we have a
                 * pathname it is relative.  The handle will be validated
@@ -264,17 +254,15 @@ acpi_evaluate_object (
                         * The null pathname case means the handle is for
                         * the actual object to be evaluated
                         */
-                       status = acpi_ns_evaluate_by_handle (&info);
-               }
-               else {
-                  /*
-                       * Both a Handle and a relative Pathname
-                       */
-                       status = acpi_ns_evaluate_relative (pathname, &info);
+                       status = acpi_ns_evaluate_by_handle(&info);
+               } else {
+                       /*
+                        * Both a Handle and a relative Pathname
+                        */
+                       status = acpi_ns_evaluate_relative(pathname, &info);
                }
        }
 
-
        /*
         * If we are expecting a return value, and all went well above,
         * copy the return value to an external object.
@@ -282,9 +270,9 @@ acpi_evaluate_object (
        if (return_buffer) {
                if (!info.return_object) {
                        return_buffer->length = 0;
-               }
-               else {
-                       if (ACPI_GET_DESCRIPTOR_TYPE (info.return_object) == ACPI_DESC_TYPE_NAMED) {
+               } else {
+                       if (ACPI_GET_DESCRIPTOR_TYPE(info.return_object) ==
+                           ACPI_DESC_TYPE_NAMED) {
                                /*
                                 * If we received a NS Node as a return object, this means that
                                 * the object we are evaluating has nothing interesting to
@@ -294,37 +282,43 @@ acpi_evaluate_object (
                                 * support for various types at a later date if necessary.
                                 */
                                status = AE_TYPE;
-                               info.return_object = NULL;  /* No need to delete a NS Node */
+                               info.return_object = NULL;      /* No need to delete a NS Node */
                                return_buffer->length = 0;
                        }
 
-                       if (ACPI_SUCCESS (status)) {
+                       if (ACPI_SUCCESS(status)) {
                                /*
                                 * Find out how large a buffer is needed
                                 * to contain the returned object
                                 */
-                               status = acpi_ut_get_object_size (info.return_object,
-                                                  &buffer_space_needed);
-                               if (ACPI_SUCCESS (status)) {
+                               status =
+                                   acpi_ut_get_object_size(info.return_object,
+                                                           &buffer_space_needed);
+                               if (ACPI_SUCCESS(status)) {
                                        /* Validate/Allocate/Clear caller buffer */
 
-                                       status = acpi_ut_initialize_buffer (return_buffer,
-                                                         buffer_space_needed);
-                                       if (ACPI_FAILURE (status)) {
+                                       status =
+                                           acpi_ut_initialize_buffer
+                                           (return_buffer,
+                                            buffer_space_needed);
+                                       if (ACPI_FAILURE(status)) {
                                                /*
                                                 * Caller's buffer is too small or a new one can't be allocated
                                                 */
-                                               ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
-                                                       "Needed buffer size %X, %s\n",
-                                                       (u32) buffer_space_needed,
-                                                       acpi_format_exception (status)));
-                                       }
-                                       else {
+                                               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                                                 "Needed buffer size %X, %s\n",
+                                                                 (u32)
+                                                                 buffer_space_needed,
+                                                                 acpi_format_exception
+                                                                 (status)));
+                                       } else {
                                                /*
                                                 *  We have enough space for the object, build it
                                                 */
-                                               status = acpi_ut_copy_iobject_to_eobject (info.return_object,
-                                                                 return_buffer);
+                                               status =
+                                                   acpi_ut_copy_iobject_to_eobject
+                                                   (info.return_object,
+                                                    return_buffer);
                                        }
                                }
                        }
@@ -336,14 +330,14 @@ acpi_evaluate_object (
                 * Delete the internal return object.  NOTE: Interpreter
                 * must be locked to avoid race condition.
                 */
-               status2 = acpi_ex_enter_interpreter ();
-               if (ACPI_SUCCESS (status2)) {
+               status2 = acpi_ex_enter_interpreter();
+               if (ACPI_SUCCESS(status2)) {
                        /*
                         * Delete the internal return object. (Or at least
                         * decrement the reference count by one)
                         */
-                       acpi_ut_remove_reference (info.return_object);
-                       acpi_ex_exit_interpreter ();
+                       acpi_ut_remove_reference(info.return_object);
+                       acpi_ex_exit_interpreter();
                }
        }
 
@@ -353,13 +347,13 @@ acpi_evaluate_object (
        if (info.parameters) {
                /* Free the allocated parameter block */
 
-               acpi_ut_delete_internal_object_list (info.parameters);
+               acpi_ut_delete_internal_object_list(info.parameters);
        }
 
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
-EXPORT_SYMBOL(acpi_evaluate_object);
 
+EXPORT_SYMBOL(acpi_evaluate_object);
 
 /*******************************************************************************
  *
@@ -392,26 +386,20 @@ EXPORT_SYMBOL(acpi_evaluate_object);
  ******************************************************************************/
 
 acpi_status
-acpi_walk_namespace (
-       acpi_object_type                type,
-       acpi_handle                     start_object,
-       u32                             max_depth,
-       acpi_walk_callback              user_function,
-       void                            *context,
-       void                            **return_value)
+acpi_walk_namespace(acpi_object_type type,
+                   acpi_handle start_object,
+                   u32 max_depth,
+                   acpi_walk_callback user_function,
+                   void *context, void **return_value)
 {
-       acpi_status                     status;
-
-
-       ACPI_FUNCTION_TRACE ("acpi_walk_namespace");
+       acpi_status status;
 
+       ACPI_FUNCTION_TRACE("acpi_walk_namespace");
 
        /* Parameter validation */
 
-       if ((type > ACPI_TYPE_EXTERNAL_MAX) ||
-               (!max_depth)                    ||
-               (!user_function)) {
-               return_ACPI_STATUS (AE_BAD_PARAMETER);
+       if ((type > ACPI_TYPE_LOCAL_MAX) || (!max_depth) || (!user_function)) {
+               return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
        /*
@@ -420,20 +408,20 @@ acpi_walk_namespace (
         * to the user function - since this function
         * must be allowed to make Acpi calls itself.
         */
-       status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
-       if (ACPI_FAILURE (status)) {
-               return_ACPI_STATUS (status);
+       status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
        }
 
-       status = acpi_ns_walk_namespace (type, start_object, max_depth,
-                         ACPI_NS_WALK_UNLOCK,
-                         user_function, context, return_value);
+       status = acpi_ns_walk_namespace(type, start_object, max_depth,
+                                       ACPI_NS_WALK_UNLOCK,
+                                       user_function, context, return_value);
 
-       (void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
-       return_ACPI_STATUS (status);
+       (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+       return_ACPI_STATUS(status);
 }
-EXPORT_SYMBOL(acpi_walk_namespace);
 
+EXPORT_SYMBOL(acpi_walk_namespace);
 
 /*******************************************************************************
  *
@@ -450,29 +438,26 @@ EXPORT_SYMBOL(acpi_walk_namespace);
  ******************************************************************************/
 
 static acpi_status
-acpi_ns_get_device_callback (
-       acpi_handle                     obj_handle,
-       u32                             nesting_level,
-       void                            *context,
-       void                            **return_value)
+acpi_ns_get_device_callback(acpi_handle obj_handle,
+                           u32 nesting_level,
+                           void *context, void **return_value)
 {
-       struct acpi_get_devices_info    *info = context;
-       acpi_status                     status;
-       struct acpi_namespace_node      *node;
-       u32                             flags;
-       struct acpi_device_id           hid;
+       struct acpi_get_devices_info *info = context;
+       acpi_status status;
+       struct acpi_namespace_node *node;
+       u32 flags;
+       struct acpi_device_id hid;
        struct acpi_compatible_id_list *cid;
-       acpi_native_uint                i;
+       acpi_native_uint i;
 
-
-       status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
-       if (ACPI_FAILURE (status)) {
+       status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+       if (ACPI_FAILURE(status)) {
                return (status);
        }
 
-       node = acpi_ns_map_handle_to_node (obj_handle);
-       status = acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
-       if (ACPI_FAILURE (status)) {
+       node = acpi_ns_map_handle_to_node(obj_handle);
+       status = acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+       if (ACPI_FAILURE(status)) {
                return (status);
        }
 
@@ -482,13 +467,13 @@ acpi_ns_get_device_callback (
 
        /* Run _STA to determine if device is present */
 
-       status = acpi_ut_execute_STA (node, &flags);
-       if (ACPI_FAILURE (status)) {
+       status = acpi_ut_execute_STA(node, &flags);
+       if (ACPI_FAILURE(status)) {
                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);
        }
@@ -496,44 +481,43 @@ acpi_ns_get_device_callback (
        /* Filter based on device HID & CID */
 
        if (info->hid != NULL) {
-               status = acpi_ut_execute_HID (node, &hid);
+               status = acpi_ut_execute_HID(node, &hid);
                if (status == AE_NOT_FOUND) {
                        return (AE_OK);
-               }
-               else if (ACPI_FAILURE (status)) {
+               } else if (ACPI_FAILURE(status)) {
                        return (AE_CTRL_DEPTH);
                }
 
-               if (ACPI_STRNCMP (hid.value, info->hid, sizeof (hid.value)) != 0) {
+               if (ACPI_STRNCMP(hid.value, info->hid, sizeof(hid.value)) != 0) {
                        /* Get the list of Compatible IDs */
 
-                       status = acpi_ut_execute_CID (node, &cid);
+                       status = acpi_ut_execute_CID(node, &cid);
                        if (status == AE_NOT_FOUND) {
                                return (AE_OK);
-                       }
-                       else if (ACPI_FAILURE (status)) {
+                       } else if (ACPI_FAILURE(status)) {
                                return (AE_CTRL_DEPTH);
                        }
 
                        /* Walk the CID list */
 
                        for (i = 0; i < cid->count; i++) {
-                               if (ACPI_STRNCMP (cid->id[i].value, info->hid,
-                                                sizeof (struct acpi_compatible_id)) != 0) {
-                                       ACPI_MEM_FREE (cid);
+                               if (ACPI_STRNCMP(cid->id[i].value, info->hid,
+                                                sizeof(struct
+                                                       acpi_compatible_id)) !=
+                                   0) {
+                                       ACPI_MEM_FREE(cid);
                                        return (AE_OK);
                                }
                        }
-                       ACPI_MEM_FREE (cid);
+                       ACPI_MEM_FREE(cid);
                }
        }
 
-       status = info->user_function (obj_handle, nesting_level, info->context,
-                        return_value);
+       status = info->user_function(obj_handle, nesting_level, info->context,
+                                    return_value);
        return (status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_get_devices
@@ -560,32 +544,28 @@ acpi_ns_get_device_callback (
  ******************************************************************************/
 
 acpi_status
-acpi_get_devices (
-       char                            *HID,
-       acpi_walk_callback              user_function,
-       void                            *context,
-       void                            **return_value)
+acpi_get_devices(char *HID,
+                acpi_walk_callback user_function,
+                void *context, void **return_value)
 {
-       acpi_status                     status;
-       struct acpi_get_devices_info    info;
-
-
-       ACPI_FUNCTION_TRACE ("acpi_get_devices");
+       acpi_status status;
+       struct acpi_get_devices_info info;
 
+       ACPI_FUNCTION_TRACE("acpi_get_devices");
 
        /* Parameter validation */
 
        if (!user_function) {
-               return_ACPI_STATUS (AE_BAD_PARAMETER);
+               return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
        /*
         * We're going to call their callback from OUR callback, so we need
         * to know what it is, and their context parameter.
         */
-       info.context      = context;
+       info.context = context;
        info.user_function = user_function;
-       info.hid          = HID;
+       info.hid = HID;
 
        /*
         * Lock the namespace around the walk.
@@ -593,22 +573,22 @@ acpi_get_devices (
         * to the user function - since this function
         * must be allowed to make Acpi calls itself.
         */
-       status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
-       if (ACPI_FAILURE (status)) {
-               return_ACPI_STATUS (status);
+       status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
        }
 
-       status = acpi_ns_walk_namespace (ACPI_TYPE_DEVICE,
-                          ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
-                          ACPI_NS_WALK_UNLOCK,
-                          acpi_ns_get_device_callback, &info,
-                          return_value);
+       status = acpi_ns_walk_namespace(ACPI_TYPE_DEVICE,
+                                       ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
+                                       ACPI_NS_WALK_UNLOCK,
+                                       acpi_ns_get_device_callback, &info,
+                                       return_value);
 
-       (void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
-       return_ACPI_STATUS (status);
+       (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+       return_ACPI_STATUS(status);
 }
-EXPORT_SYMBOL(acpi_get_devices);
 
+EXPORT_SYMBOL(acpi_get_devices);
 
 /*******************************************************************************
  *
@@ -625,44 +605,38 @@ EXPORT_SYMBOL(acpi_get_devices);
  ******************************************************************************/
 
 acpi_status
-acpi_attach_data (
-       acpi_handle                     obj_handle,
-       acpi_object_handler             handler,
-       void                            *data)
+acpi_attach_data(acpi_handle obj_handle,
+                acpi_object_handler handler, void *data)
 {
-       struct acpi_namespace_node      *node;
-       acpi_status                     status;
-
+       struct acpi_namespace_node *node;
+       acpi_status status;
 
        /* Parameter validation */
 
-       if (!obj_handle ||
-               !handler    ||
-               !data) {
+       if (!obj_handle || !handler || !data) {
                return (AE_BAD_PARAMETER);
        }
 
-       status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
-       if (ACPI_FAILURE (status)) {
+       status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+       if (ACPI_FAILURE(status)) {
                return (status);
        }
 
        /* Convert and validate the handle */
 
-       node = acpi_ns_map_handle_to_node (obj_handle);
+       node = acpi_ns_map_handle_to_node(obj_handle);
        if (!node) {
                status = AE_BAD_PARAMETER;
                goto unlock_and_exit;
        }
 
-       status = acpi_ns_attach_data (node, handler, data);
+       status = acpi_ns_attach_data(node, handler, data);
 
-unlock_and_exit:
-       (void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
+      unlock_and_exit:
+       (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return (status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_detach_data
@@ -677,42 +651,37 @@ unlock_and_exit:
  ******************************************************************************/
 
 acpi_status
-acpi_detach_data (
-       acpi_handle                     obj_handle,
-       acpi_object_handler             handler)
+acpi_detach_data(acpi_handle obj_handle, acpi_object_handler handler)
 {
-       struct acpi_namespace_node      *node;
-       acpi_status                     status;
-
+       struct acpi_namespace_node *node;
+       acpi_status status;
 
        /* Parameter validation */
 
-       if (!obj_handle ||
-               !handler) {
+       if (!obj_handle || !handler) {
                return (AE_BAD_PARAMETER);
        }
 
-       status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
-       if (ACPI_FAILURE (status)) {
+       status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+       if (ACPI_FAILURE(status)) {
                return (status);
        }
 
        /* Convert and validate the handle */
 
-       node = acpi_ns_map_handle_to_node (obj_handle);
+       node = acpi_ns_map_handle_to_node(obj_handle);
        if (!node) {
                status = AE_BAD_PARAMETER;
                goto unlock_and_exit;
        }
 
-       status = acpi_ns_detach_data (node, handler);
+       status = acpi_ns_detach_data(node, handler);
 
-unlock_and_exit:
-       (void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
+      unlock_and_exit:
+       (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return (status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_get_data
@@ -728,41 +697,33 @@ unlock_and_exit:
  ******************************************************************************/
 
 acpi_status
-acpi_get_data (
-       acpi_handle                     obj_handle,
-       acpi_object_handler             handler,
-       void                            **data)
+acpi_get_data(acpi_handle obj_handle, acpi_object_handler handler, void **data)
 {
-       struct acpi_namespace_node      *node;
-       acpi_status                     status;
-
+       struct acpi_namespace_node *node;
+       acpi_status status;
 
        /* Parameter validation */
 
-       if (!obj_handle ||
-               !handler    ||
-               !data) {
+       if (!obj_handle || !handler || !data) {
                return (AE_BAD_PARAMETER);
        }
 
-       status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
-       if (ACPI_FAILURE (status)) {
+       status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+       if (ACPI_FAILURE(status)) {
                return (status);
        }
 
        /* Convert and validate the handle */
 
-       node = acpi_ns_map_handle_to_node (obj_handle);
+       node = acpi_ns_map_handle_to_node(obj_handle);
        if (!node) {
                status = AE_BAD_PARAMETER;
                goto unlock_and_exit;
        }
 
-       status = acpi_ns_get_attached_data (node, handler, data);
+       status = acpi_ns_get_attached_data(node, handler, data);
 
-unlock_and_exit:
-       (void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
+      unlock_and_exit:
+       (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return (status);
 }
-
-