1 files changed, 9 insertions, 8 deletions

diff --git a/drivers/acpi/executer/exoparg3.c b/drivers/acpi/executer/exoparg3.c
index 6a3a883cb8a3..e2d945dfd509 100644
--- a/drivers/acpi/executer/exoparg3.c
+++ b/drivers/acpi/executer/exoparg3.c
@@ -88,20 +88,19 @@ acpi_status acpi_ex_opcode_3A_0T_0R(struct acpi_walk_state *walk_state)
         struct acpi_signal_fatal_info *fatal;
         acpi_status status = AE_OK;
 
-        ACPI_FUNCTION_TRACE_STR("ex_opcode_3A_0T_0R",
+        ACPI_FUNCTION_TRACE_STR(ex_opcode_3A_0T_0R,
                                 acpi_ps_get_opcode_name(walk_state->opcode));
 
         switch (walk_state->opcode) {
         case AML_FATAL_OP:      /* Fatal (fatal_type fatal_code fatal_arg) */
 
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "fatal_op: Type %X Code %X Arg %X <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n",
+                                  "FatalOp: Type %X Code %X Arg %X <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n",
                                   (u32) operand[0]->integer.value,
                                   (u32) operand[1]->integer.value,
                                   (u32) operand[2]->integer.value));
 
-                fatal =
-                    ACPI_MEM_ALLOCATE(sizeof(struct acpi_signal_fatal_info));
+                fatal = ACPI_ALLOCATE(sizeof(struct acpi_signal_fatal_info));
                 if (fatal) {
                         fatal->type = (u32) operand[0]->integer.value;
                         fatal->code = (u32) operand[1]->integer.value;
@@ -114,7 +113,7 @@ acpi_status acpi_ex_opcode_3A_0T_0R(struct acpi_walk_state *walk_state)
 
                 /* Might return while OS is shutting down, just continue */
 
-                ACPI_MEM_FREE(fatal);
+                ACPI_FREE(fatal);
                 break;
 
         default:
@@ -151,7 +150,7 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
         acpi_integer index;
         acpi_size length;
 
-        ACPI_FUNCTION_TRACE_STR("ex_opcode_3A_1T_1R",
+        ACPI_FUNCTION_TRACE_STR(ex_opcode_3A_1T_1R,
                                 acpi_ps_get_opcode_name(walk_state->opcode));
 
         switch (walk_state->opcode) {
@@ -196,7 +195,7 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
 
                         /* Always allocate a new buffer for the String */
 
-                        buffer = ACPI_MEM_CALLOCATE((acpi_size) length + 1);
+                        buffer = ACPI_ALLOCATE_ZEROED((acpi_size) length + 1);
                         if (!buffer) {
                                 status = AE_NO_MEMORY;
                                 goto cleanup;
@@ -208,9 +207,10 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
                         /* If the requested length is zero, don't allocate a buffer */
 
                         if (length > 0) {
+
                                 /* Allocate a new buffer for the Buffer */
 
-                                buffer = ACPI_MEM_CALLOCATE(length);
+                                buffer = ACPI_ALLOCATE_ZEROED(length);
                                 if (!buffer) {
                                         status = AE_NO_MEMORY;
                                         goto cleanup;
@@ -225,6 +225,7 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
                 }
 
                 if (buffer) {
+
                         /* We have a buffer, copy the portion requested */
 
                         ACPI_MEMCPY(buffer, operand[0]->string.pointer + index,