diff options
author | Bob Moore <robert.moore@intel.com> | 2009-03-05 21:05:18 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-03-27 12:11:02 -0400 |
commit | d4913dc6d0c680aa106d1d80b5ad2a9325367afd (patch) | |
tree | 4ce6e658b21a2bc69e7c57caa6f7dfa1ff8ec53b /drivers/acpi/acpica/nsalloc.c | |
parent | 768aaaf196e8a40f5cfc792d9d365795cc52ed13 (diff) |
ACPICA: Formatting update - no functional changes
Split long lines, update comments.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/nsalloc.c')
-rw-r--r-- | drivers/acpi/acpica/nsalloc.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/drivers/acpi/acpica/nsalloc.c b/drivers/acpi/acpica/nsalloc.c index f976d848fe82..aceb93111967 100644 --- 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) | |||
76 | ACPI_MEM_TRACKING(acpi_gbl_ns_node_list->total_allocated++); | 76 | ACPI_MEM_TRACKING(acpi_gbl_ns_node_list->total_allocated++); |
77 | 77 | ||
78 | #ifdef ACPI_DBG_TRACK_ALLOCATIONS | 78 | #ifdef ACPI_DBG_TRACK_ALLOCATIONS |
79 | temp = | 79 | temp = acpi_gbl_ns_node_list->total_allocated - |
80 | acpi_gbl_ns_node_list->total_allocated - | ||
81 | acpi_gbl_ns_node_list->total_freed; | 80 | acpi_gbl_ns_node_list->total_freed; |
82 | if (temp > acpi_gbl_ns_node_list->max_occupied) { | 81 | if (temp > acpi_gbl_ns_node_list->max_occupied) { |
83 | acpi_gbl_ns_node_list->max_occupied = temp; | 82 | acpi_gbl_ns_node_list->max_occupied = temp; |
@@ -145,9 +144,8 @@ void acpi_ns_delete_node(struct acpi_namespace_node *node) | |||
145 | 144 | ||
146 | ACPI_MEM_TRACKING(acpi_gbl_ns_node_list->total_freed++); | 145 | ACPI_MEM_TRACKING(acpi_gbl_ns_node_list->total_freed++); |
147 | 146 | ||
148 | /* | 147 | /* Detach an object if there is one, then delete the node */ |
149 | * Detach an object if there is one, then delete the node | 148 | |
150 | */ | ||
151 | acpi_ns_detach_object(node); | 149 | acpi_ns_detach_object(node); |
152 | (void)acpi_os_release_object(acpi_gbl_namespace_cache, node); | 150 | (void)acpi_os_release_object(acpi_gbl_namespace_cache, node); |
153 | return_VOID; | 151 | return_VOID; |
@@ -183,9 +181,8 @@ void acpi_ns_install_node(struct acpi_walk_state *walk_state, struct acpi_namesp | |||
183 | ACPI_FUNCTION_TRACE(ns_install_node); | 181 | ACPI_FUNCTION_TRACE(ns_install_node); |
184 | 182 | ||
185 | /* | 183 | /* |
186 | * Get the owner ID from the Walk state | 184 | * Get the owner ID from the Walk state. The owner ID is used to track |
187 | * The owner ID is used to track table deletion and | 185 | * table deletion and deletion of objects created by methods. |
188 | * deletion of objects created by methods | ||
189 | */ | 186 | */ |
190 | if (walk_state) { | 187 | if (walk_state) { |
191 | owner_id = walk_state->owner_id; | 188 | owner_id = walk_state->owner_id; |
@@ -260,9 +257,8 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node) | |||
260 | return_VOID; | 257 | return_VOID; |
261 | } | 258 | } |
262 | 259 | ||
263 | /* | 260 | /* Deallocate all children at this level */ |
264 | * Deallocate all children at this level | 261 | |
265 | */ | ||
266 | do { | 262 | do { |
267 | 263 | ||
268 | /* Get the things we need */ | 264 | /* Get the things we need */ |
@@ -285,9 +281,8 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node) | |||
285 | "Object %p, Remaining %X\n", child_node, | 281 | "Object %p, Remaining %X\n", child_node, |
286 | acpi_gbl_current_node_count)); | 282 | acpi_gbl_current_node_count)); |
287 | 283 | ||
288 | /* | 284 | /* Detach an object if there is one, then free the child node */ |
289 | * Detach an object if there is one, then free the child node | 285 | |
290 | */ | ||
291 | acpi_ns_detach_object(child_node); | 286 | acpi_ns_detach_object(child_node); |
292 | 287 | ||
293 | /* Now we can delete the node */ | 288 | /* Now we can delete the node */ |
@@ -304,7 +299,6 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node) | |||
304 | /* Clear the parent's child pointer */ | 299 | /* Clear the parent's child pointer */ |
305 | 300 | ||
306 | parent_node->child = NULL; | 301 | parent_node->child = NULL; |
307 | |||
308 | return_VOID; | 302 | return_VOID; |
309 | } | 303 | } |
310 | 304 | ||