diff options
Diffstat (limited to 'drivers/acpi/namespace/nsalloc.c')
-rw-r--r-- | drivers/acpi/namespace/nsalloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/namespace/nsalloc.c b/drivers/acpi/namespace/nsalloc.c index cd26cb971a1c..acd4b6732ac4 100644 --- a/drivers/acpi/namespace/nsalloc.c +++ b/drivers/acpi/namespace/nsalloc.c | |||
@@ -68,7 +68,7 @@ struct acpi_namespace_node *acpi_ns_create_node(u32 name) | |||
68 | 68 | ||
69 | ACPI_FUNCTION_TRACE("ns_create_node"); | 69 | ACPI_FUNCTION_TRACE("ns_create_node"); |
70 | 70 | ||
71 | node = ACPI_MEM_CALLOCATE(sizeof(struct acpi_namespace_node)); | 71 | node = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_namespace_node)); |
72 | if (!node) { | 72 | if (!node) { |
73 | return_PTR(NULL); | 73 | return_PTR(NULL); |
74 | } | 74 | } |
@@ -142,7 +142,7 @@ void acpi_ns_delete_node(struct acpi_namespace_node *node) | |||
142 | * Detach an object if there is one then delete the node | 142 | * Detach an object if there is one then delete the node |
143 | */ | 143 | */ |
144 | acpi_ns_detach_object(node); | 144 | acpi_ns_detach_object(node); |
145 | ACPI_MEM_FREE(node); | 145 | ACPI_FREE(node); |
146 | return_VOID; | 146 | return_VOID; |
147 | } | 147 | } |
148 | 148 | ||
@@ -311,7 +311,7 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node) | |||
311 | 311 | ||
312 | /* Now we can delete the node */ | 312 | /* Now we can delete the node */ |
313 | 313 | ||
314 | ACPI_MEM_FREE(child_node); | 314 | ACPI_FREE(child_node); |
315 | 315 | ||
316 | /* And move on to the next child in the list */ | 316 | /* And move on to the next child in the list */ |
317 | 317 | ||