5 files changed, 10 insertions, 12 deletions

diff --git a/drivers/acpi/dispatcher/dsmthdat.c b/drivers/acpi/dispatcher/dsmthdat.c
index f7cb5170aa11..2ed48439835d 100644
--- a/drivers/acpi/dispatcher/dsmthdat.c
+++ b/drivers/acpi/dispatcher/dsmthdat.c
@@ -81,7 +81,7 @@ acpi_ds_method_data_get_type(u16 opcode,
  *              special data types.
  *
  * NOTES:       walk_state fields are initialized to zero by the
- *              ACPI_MEM_CALLOCATE().
+ *              ACPI_ALLOCATE_ZEROED().
  *
  *              A pseudo-Namespace Node is assigned to each argument and local
  *              so that ref_of() can return a pointer to the Node.
diff --git a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c
index 1f2d0c6ef36c..ce54715f13ad 100644
--- a/drivers/acpi/dispatcher/dsobject.c
+++ b/drivers/acpi/dispatcher/dsobject.c
@@ -245,7 +245,7 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
                                   "Buffer defined with zero length in AML, creating\n"));
         } else {
                 obj_desc->buffer.pointer =
-                    ACPI_MEM_CALLOCATE(obj_desc->buffer.length);
+                    ACPI_ALLOCATE_ZEROED(obj_desc->buffer.length);
                 if (!obj_desc->buffer.pointer) {
                         acpi_ut_delete_object_desc(obj_desc);
                         return_ACPI_STATUS(AE_NO_MEMORY);
@@ -341,9 +341,10 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
          * individual objects). Add an extra pointer slot so
          * that the list is always null terminated.
          */
-        obj_desc->package.elements = ACPI_MEM_CALLOCATE(((acpi_size) obj_desc->
-                                                         package.count +
-                                                         1) * sizeof(void *));
+        obj_desc->package.elements = ACPI_ALLOCATE_ZEROED(((acpi_size)
+                                                           obj_desc->package.
+                                                           count +
+                                                           1) * sizeof(void *));
 
         if (!obj_desc->package.elements) {
                 acpi_ut_delete_object_desc(obj_desc);
diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c
index 3fbe17ebef5a..ab24aa88e2fa 100644
--- a/drivers/acpi/dispatcher/dsutils.c
+++ b/drivers/acpi/dispatcher/dsutils.c
@@ -577,7 +577,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
 
                 /* Free the namestring created above */
 
-                ACPI_MEM_FREE(name_string);
+                ACPI_FREE(name_string);
 
                 /* Check status from the lookup */
 
diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index 02b03126e14e..1ad7870101fb 100644
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@ -1113,7 +1113,6 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
                                    ACPI_NS_DONT_OPEN_SCOPE, walk_state,
                                    &(new_node));
                 if (ACPI_SUCCESS(status)) {
-
                         /*
                          * Make sure that what we found is indeed a method
                          * We didn't search for a method on purpose, to see if the name
diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index 5bc340b1b286..d2846ffc9773 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.c
@@ -66,7 +66,6 @@ void *acpi_ds_obj_stack_get_value(u32 index,
 #endif
 
 #ifdef ACPI_FUTURE_USAGE
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ds_result_remove
@@ -128,7 +127,6 @@ acpi_ds_result_remove(union acpi_operand_object **object,
 
         return (AE_OK);
 }
-
 #endif                          /*  ACPI_FUTURE_USAGE  */
 
 /*******************************************************************************
@@ -645,7 +643,7 @@ struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,
 
         ACPI_FUNCTION_TRACE("ds_create_walk_state");
 
-        walk_state = ACPI_MEM_CALLOCATE(sizeof(struct acpi_walk_state));
+        walk_state = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_walk_state));
         if (!walk_state) {
                 return_PTR(NULL);
         }
@@ -668,7 +666,7 @@ struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,
 
         status = acpi_ds_result_stack_push(walk_state);
         if (ACPI_FAILURE(status)) {
-                ACPI_MEM_FREE(walk_state);
+                ACPI_FREE(walk_state);
                 return_PTR(NULL);
         }
 
@@ -859,7 +857,7 @@ void acpi_ds_delete_walk_state(struct acpi_walk_state *walk_state)
                 acpi_ut_delete_generic_state(state);
         }
 
-        ACPI_MEM_FREE(walk_state);
+        ACPI_FREE(walk_state);
         return_VOID;
 }