]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/acpi/namespace/nsalloc.c
[PATCH] libata: make code actually compile with debugging on
[linux-2.6-omap-h63xx.git] / drivers / acpi / namespace / nsalloc.c
index 21d560decbf9b3c10a2342ed754d7d2dc5e471bf..9b871f38b61b81ff2480c951aae6095d6a13e1fd 100644 (file)
@@ -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
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <acpi/acpi.h>
 #include <acpi/acnamesp.h>
 
-
 #define _COMPONENT          ACPI_NAMESPACE
-        ACPI_MODULE_NAME    ("nsalloc")
+ACPI_MODULE_NAME("nsalloc")
 
 /* Local prototypes */
-
-static void
-acpi_ns_remove_reference (
-       struct acpi_namespace_node      *node);
-
+static void acpi_ns_remove_reference(struct acpi_namespace_node *node);
 
 /*******************************************************************************
  *
@@ -68,31 +62,26 @@ acpi_ns_remove_reference (
  *
  ******************************************************************************/
 
-struct acpi_namespace_node *
-acpi_ns_create_node (
-       u32                             name)
+struct acpi_namespace_node *acpi_ns_create_node(u32 name)
 {
-       struct acpi_namespace_node      *node;
-
+       struct acpi_namespace_node *node;
 
-       ACPI_FUNCTION_TRACE ("ns_create_node");
+       ACPI_FUNCTION_TRACE("ns_create_node");
 
-
-       node = ACPI_MEM_CALLOCATE (sizeof (struct acpi_namespace_node));
+       node = ACPI_MEM_CALLOCATE(sizeof(struct acpi_namespace_node));
        if (!node) {
-               return_PTR (NULL);
+               return_PTR(NULL);
        }
 
-       ACPI_MEM_TRACKING (acpi_gbl_ns_node_list->total_allocated++);
+       ACPI_MEM_TRACKING(acpi_gbl_ns_node_list->total_allocated++);
 
-       node->name.integer   = name;
+       node->name.integer = name;
        node->reference_count = 1;
-       ACPI_SET_DESCRIPTOR_TYPE (node, ACPI_DESC_TYPE_NAMED);
+       ACPI_SET_DESCRIPTOR_TYPE(node, ACPI_DESC_TYPE_NAMED);
 
-       return_PTR (node);
+       return_PTR(node);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_delete_node
@@ -105,19 +94,15 @@ acpi_ns_create_node (
  *
  ******************************************************************************/
 
-void
-acpi_ns_delete_node (
-       struct acpi_namespace_node      *node)
+void acpi_ns_delete_node(struct acpi_namespace_node *node)
 {
-       struct acpi_namespace_node      *parent_node;
-       struct acpi_namespace_node      *prev_node;
-       struct acpi_namespace_node      *next_node;
-
-
-       ACPI_FUNCTION_TRACE_PTR ("ns_delete_node", node);
+       struct acpi_namespace_node *parent_node;
+       struct acpi_namespace_node *prev_node;
+       struct acpi_namespace_node *next_node;
 
+       ACPI_FUNCTION_TRACE_PTR("ns_delete_node", node);
 
-       parent_node = acpi_ns_get_parent_node (node);
+       parent_node = acpi_ns_get_parent_node(node);
 
        prev_node = NULL;
        next_node = parent_node->child;
@@ -136,32 +121,29 @@ acpi_ns_delete_node (
                if (next_node->flags & ANOBJ_END_OF_PEER_LIST) {
                        prev_node->flags |= ANOBJ_END_OF_PEER_LIST;
                }
-       }
-       else {
+       } else {
                /* Node is first child (has no previous peer) */
 
                if (next_node->flags & ANOBJ_END_OF_PEER_LIST) {
                        /* No peers at all */
 
                        parent_node->child = NULL;
-               }
-               else {   /* Link peer list to parent */
+               } else {        /* Link peer list to parent */
 
                        parent_node->child = next_node->peer;
                }
        }
 
-       ACPI_MEM_TRACKING (acpi_gbl_ns_node_list->total_freed++);
+       ACPI_MEM_TRACKING(acpi_gbl_ns_node_list->total_freed++);
 
        /*
         * Detach an object if there is one then delete the node
         */
-       acpi_ns_detach_object (node);
-       ACPI_MEM_FREE (node);
+       acpi_ns_detach_object(node);
+       ACPI_MEM_FREE(node);
        return_VOID;
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_install_node
@@ -182,19 +164,14 @@ acpi_ns_delete_node (
  *
  ******************************************************************************/
 
-void
-acpi_ns_install_node (
-       struct acpi_walk_state          *walk_state,
-       struct acpi_namespace_node      *parent_node,   /* Parent */
-       struct acpi_namespace_node      *node,          /* New Child*/
-       acpi_object_type                type)
+void acpi_ns_install_node(struct acpi_walk_state *walk_state, struct acpi_namespace_node *parent_node, /* Parent */
+                         struct acpi_namespace_node *node,     /* New Child */
+                         acpi_object_type type)
 {
-       acpi_owner_id                   owner_id = 0;
-       struct acpi_namespace_node      *child_node;
-
-
-       ACPI_FUNCTION_TRACE ("ns_install_node");
+       acpi_owner_id owner_id = 0;
+       struct acpi_namespace_node *child_node;
 
+       ACPI_FUNCTION_TRACE("ns_install_node");
 
        /*
         * Get the owner ID from the Walk state
@@ -212,8 +189,7 @@ acpi_ns_install_node (
                parent_node->child = node;
                node->flags |= ANOBJ_END_OF_PEER_LIST;
                node->peer = parent_node;
-       }
-       else {
+       } else {
                while (!(child_node->flags & ANOBJ_END_OF_PEER_LIST)) {
                        child_node = child_node->peer;
                }
@@ -232,24 +208,25 @@ acpi_ns_install_node (
        node->owner_id = owner_id;
        node->type = (u8) type;
 
-       ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
-               "%4.4s (%s) [Node %p Owner %X] added to %4.4s (%s) [Node %p]\n",
-               acpi_ut_get_node_name (node), acpi_ut_get_type_name (node->type), node, owner_id,
-               acpi_ut_get_node_name (parent_node), acpi_ut_get_type_name (parent_node->type),
-               parent_node));
+       ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
+                         "%4.4s (%s) [Node %p Owner %X] added to %4.4s (%s) [Node %p]\n",
+                         acpi_ut_get_node_name(node),
+                         acpi_ut_get_type_name(node->type), node, owner_id,
+                         acpi_ut_get_node_name(parent_node),
+                         acpi_ut_get_type_name(parent_node->type),
+                         parent_node));
 
        /*
         * Increment the reference count(s) of all parents up to
         * the root!
         */
-       while ((node = acpi_ns_get_parent_node (node)) != NULL) {
+       while ((node = acpi_ns_get_parent_node(node)) != NULL) {
                node->reference_count++;
        }
 
        return_VOID;
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_delete_children
@@ -263,18 +240,14 @@ acpi_ns_install_node (
  *
  ******************************************************************************/
 
-void
-acpi_ns_delete_children (
-       struct acpi_namespace_node      *parent_node)
+void acpi_ns_delete_children(struct acpi_namespace_node *parent_node)
 {
-       struct acpi_namespace_node      *child_node;
-       struct acpi_namespace_node      *next_node;
-       struct acpi_namespace_node      *node;
-       u8                              flags;
-
-
-       ACPI_FUNCTION_TRACE_PTR ("ns_delete_children", parent_node);
+       struct acpi_namespace_node *child_node;
+       struct acpi_namespace_node *next_node;
+       struct acpi_namespace_node *node;
+       u8 flags;
 
+       ACPI_FUNCTION_TRACE_PTR("ns_delete_children", parent_node);
 
        if (!parent_node) {
                return_VOID;
@@ -293,48 +266,49 @@ acpi_ns_delete_children (
        do {
                /* Get the things we need */
 
-               next_node   = child_node->peer;
-               flags       = child_node->flags;
+               next_node = child_node->peer;
+               flags = child_node->flags;
 
                /* 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 */
 
-               ACPI_MEM_TRACKING (acpi_gbl_ns_node_list->total_freed++);
+               ACPI_MEM_TRACKING(acpi_gbl_ns_node_list->total_freed++);
 
-               ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS, "Object %p, Remaining %X\n",
-                       child_node, acpi_gbl_current_node_count));
+               ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
+                                 "Object %p, Remaining %X\n", child_node,
+                                 acpi_gbl_current_node_count));
 
                /*
                 * Detach an object if there is one, then free the child node
                 */
-               acpi_ns_detach_object (child_node);
+               acpi_ns_detach_object(child_node);
 
                /*
                 * Decrement the reference count(s) of all parents up to
                 * the root! (counts were incremented when the node was created)
                 */
                node = child_node;
-               while ((node = acpi_ns_get_parent_node (node)) != NULL) {
+               while ((node = acpi_ns_get_parent_node(node)) != NULL) {
                        node->reference_count--;
                }
 
                /* 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 */
 
-               ACPI_MEM_FREE (child_node);
+               ACPI_MEM_FREE(child_node);
 
                /* And move on to the next child in the list */
 
@@ -342,7 +316,6 @@ acpi_ns_delete_children (
 
        } while (!(flags & ANOBJ_END_OF_PEER_LIST));
 
-
        /* Clear the parent's child pointer */
 
        parent_node->child = NULL;
@@ -350,7 +323,6 @@ acpi_ns_delete_children (
        return_VOID;
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_delete_namespace_subtree
@@ -364,16 +336,12 @@ acpi_ns_delete_children (
  *
  ******************************************************************************/
 
-void
-acpi_ns_delete_namespace_subtree (
-       struct acpi_namespace_node      *parent_node)
+void acpi_ns_delete_namespace_subtree(struct acpi_namespace_node *parent_node)
 {
-       struct acpi_namespace_node      *child_node = NULL;
-       u32                             level = 1;
-
-
-       ACPI_FUNCTION_TRACE ("ns_delete_namespace_subtree");
+       struct acpi_namespace_node *child_node = NULL;
+       u32 level = 1;
 
+       ACPI_FUNCTION_TRACE("ns_delete_namespace_subtree");
 
        if (!parent_node) {
                return_VOID;
@@ -386,16 +354,17 @@ acpi_ns_delete_namespace_subtree (
        while (level > 0) {
                /* Get the next node in this scope (NULL if none) */
 
-               child_node = acpi_ns_get_next_node (ACPI_TYPE_ANY, parent_node,
-                                child_node);
+               child_node = acpi_ns_get_next_node(ACPI_TYPE_ANY, parent_node,
+                                                  child_node);
                if (child_node) {
                        /* Found a child node - detach any attached object */
 
-                       acpi_ns_detach_object (child_node);
+                       acpi_ns_detach_object(child_node);
 
                        /* Check if this node has any children */
 
-                       if (acpi_ns_get_next_node (ACPI_TYPE_ANY, child_node, NULL)) {
+                       if (acpi_ns_get_next_node
+                           (ACPI_TYPE_ANY, child_node, NULL)) {
                                /*
                                 * There is at least one child of this node,
                                 * visit the node
@@ -404,8 +373,7 @@ acpi_ns_delete_namespace_subtree (
                                parent_node = child_node;
                                child_node = NULL;
                        }
-               }
-               else {
+               } else {
                        /*
                         * No more children of this parent node.
                         * Move up to the grandparent.
@@ -416,7 +384,7 @@ acpi_ns_delete_namespace_subtree (
                         * Now delete all of the children of this parent
                         * all at the same time.
                         */
-                       acpi_ns_delete_children (parent_node);
+                       acpi_ns_delete_children(parent_node);
 
                        /* New "last child" is this parent node */
 
@@ -424,14 +392,13 @@ acpi_ns_delete_namespace_subtree (
 
                        /* Move up the tree to the grandparent */
 
-                       parent_node = acpi_ns_get_parent_node (parent_node);
+                       parent_node = acpi_ns_get_parent_node(parent_node);
                }
        }
 
        return_VOID;
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_remove_reference
@@ -447,16 +414,12 @@ acpi_ns_delete_namespace_subtree (
  *
  ******************************************************************************/
 
-static void
-acpi_ns_remove_reference (
-       struct acpi_namespace_node      *node)
+static void acpi_ns_remove_reference(struct acpi_namespace_node *node)
 {
-       struct acpi_namespace_node      *parent_node;
-       struct acpi_namespace_node      *this_node;
-
-
-       ACPI_FUNCTION_ENTRY ();
+       struct acpi_namespace_node *parent_node;
+       struct acpi_namespace_node *this_node;
 
+       ACPI_FUNCTION_ENTRY();
 
        /*
         * Decrement the reference count(s) of this node and all
@@ -466,7 +429,7 @@ acpi_ns_remove_reference (
        while (this_node) {
                /* Prepare to move up to parent */
 
-               parent_node = acpi_ns_get_parent_node (this_node);
+               parent_node = acpi_ns_get_parent_node(this_node);
 
                /* Decrement the reference count on this node */
 
@@ -477,15 +440,14 @@ acpi_ns_remove_reference (
                if (!this_node->reference_count) {
                        /* Delete all children and delete the node */
 
-                       acpi_ns_delete_children (this_node);
-                       acpi_ns_delete_node (this_node);
+                       acpi_ns_delete_children(this_node);
+                       acpi_ns_delete_node(this_node);
                }
 
                this_node = parent_node;
        }
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_delete_namespace_by_owner
@@ -500,27 +462,23 @@ acpi_ns_remove_reference (
  *
  ******************************************************************************/
 
-void
-acpi_ns_delete_namespace_by_owner (
-       acpi_owner_id                    owner_id)
+void acpi_ns_delete_namespace_by_owner(acpi_owner_id owner_id)
 {
-       struct acpi_namespace_node      *child_node;
-       struct acpi_namespace_node      *deletion_node;
-       u32                             level;
-       struct acpi_namespace_node      *parent_node;
-
-
-       ACPI_FUNCTION_TRACE_U32 ("ns_delete_namespace_by_owner", owner_id);
+       struct acpi_namespace_node *child_node;
+       struct acpi_namespace_node *deletion_node;
+       u32 level;
+       struct acpi_namespace_node *parent_node;
 
+       ACPI_FUNCTION_TRACE_U32("ns_delete_namespace_by_owner", owner_id);
 
        if (owner_id == 0) {
                return_VOID;
        }
 
-       parent_node   = acpi_gbl_root_node;
-       child_node    = NULL;
+       parent_node = acpi_gbl_root_node;
+       child_node = NULL;
        deletion_node = NULL;
-       level         = 1;
+       level = 1;
 
        /*
         * Traverse the tree of nodes until we bubble back up
@@ -531,10 +489,12 @@ acpi_ns_delete_namespace_by_owner (
                 * Get the next child of this parent node. When child_node is NULL,
                 * the first child of the parent is returned
                 */
-               child_node = acpi_ns_get_next_node (ACPI_TYPE_ANY, parent_node, child_node);
+               child_node =
+                   acpi_ns_get_next_node(ACPI_TYPE_ANY, parent_node,
+                                         child_node);
 
                if (deletion_node) {
-                       acpi_ns_remove_reference (deletion_node);
+                       acpi_ns_remove_reference(deletion_node);
                        deletion_node = NULL;
                }
 
@@ -542,12 +502,13 @@ acpi_ns_delete_namespace_by_owner (
                        if (child_node->owner_id == owner_id) {
                                /* Found a matching child node - detach any attached object */
 
-                               acpi_ns_detach_object (child_node);
+                               acpi_ns_detach_object(child_node);
                        }
 
                        /* Check if this node has any children */
 
-                       if (acpi_ns_get_next_node (ACPI_TYPE_ANY, child_node, NULL)) {
+                       if (acpi_ns_get_next_node
+                           (ACPI_TYPE_ANY, child_node, NULL)) {
                                /*
                                 * There is at least one child of this node,
                                 * visit the node
@@ -555,12 +516,10 @@ acpi_ns_delete_namespace_by_owner (
                                level++;
                                parent_node = child_node;
                                child_node = NULL;
-                       }
-                       else if (child_node->owner_id == owner_id) {
+                       } else if (child_node->owner_id == owner_id) {
                                deletion_node = child_node;
                        }
-               }
-               else {
+               } else {
                        /*
                         * No more children of this parent node.
                         * Move up to the grandparent.
@@ -578,11 +537,9 @@ acpi_ns_delete_namespace_by_owner (
 
                        /* Move up the tree to the grandparent */
 
-                       parent_node = acpi_ns_get_parent_node (parent_node);
+                       parent_node = acpi_ns_get_parent_node(parent_node);
                }
        }
 
        return_VOID;
 }
-
-