Merge branch 'audit.b62' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...

[sfrench/cifs-2.6.git] / drivers / acpi / acpica / nsalloc.c

diff --git a/drivers/acpi/acpica/nsalloc.c b/drivers/acpi/acpica/nsalloc.c
index f976d848fe8241c0845ad4063d8a86c554aaefec..aceb93111967f35a7f0a335c4bcb2798c4d56304 100644 (file)
--- a/drivers/acpi/acpica/nsalloc.c
+++ b/drivers/acpi/acpica/nsalloc.c
@@ -76,8 +76,7 @@ struct acpi_namespace_node *acpi_ns_create_node(u32 name)
        ACPI_MEM_TRACKING(acpi_gbl_ns_node_list->total_allocated++);
 
 #ifdef ACPI_DBG_TRACK_ALLOCATIONS
-       temp =
-           acpi_gbl_ns_node_list->total_allocated -
+       temp = acpi_gbl_ns_node_list->total_allocated -
            acpi_gbl_ns_node_list->total_freed;
        if (temp > acpi_gbl_ns_node_list->max_occupied) {
                acpi_gbl_ns_node_list->max_occupied = temp;
@@ -145,9 +144,8 @@ void acpi_ns_delete_node(struct acpi_namespace_node *node)
 
        ACPI_MEM_TRACKING(acpi_gbl_ns_node_list->total_freed++);
 
-       /*
-        * Detach an object if there is one, then delete the node
-        */
+       /* Detach an object if there is one, then delete the node */
+
        acpi_ns_detach_object(node);
        (void)acpi_os_release_object(acpi_gbl_namespace_cache, node);
        return_VOID;
@@ -183,9 +181,8 @@ void acpi_ns_install_node(struct acpi_walk_state *walk_state, struct acpi_namesp
        ACPI_FUNCTION_TRACE(ns_install_node);
 
        /*
-        * Get the owner ID from the Walk state
-        * The owner ID is used to track table deletion and
-        * deletion of objects created by methods
+        * Get the owner ID from the Walk state. The owner ID is used to track
+        * table deletion and deletion of objects created by methods.
         */
        if (walk_state) {
                owner_id = walk_state->owner_id;
@@ -260,9 +257,8 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node)
                return_VOID;
        }
 
-       /*
-        * Deallocate all children at this level
-        */
+       /* Deallocate all children at this level */
+
        do {
 
                /* Get the things we need */
@@ -285,9 +281,8 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node)
                                  "Object %p, Remaining %X\n", child_node,
                                  acpi_gbl_current_node_count));
 
-               /*
-                * Detach an object if there is one, then free the child node
-                */
+               /* Detach an object if there is one, then free the child node */
+
                acpi_ns_detach_object(child_node);
 
                /* Now we can delete the node */
@@ -304,7 +299,6 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node)
        /* Clear the parent's child pointer */
 
        parent_node->child = NULL;
-
        return_VOID;
 }