1 files changed, 20 insertions, 16 deletions

diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c
index a7cca8d4f855..7b9718e976bf 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/executer/exdump.c
@@ -61,6 +61,10 @@ static void acpi_ex_out_pointer(char *title, void *value);
 
 static void acpi_ex_out_address(char *title, acpi_physical_address value);
 
+static void
+acpi_ex_dump_object(union acpi_operand_object *obj_desc,
+                    struct acpi_exdump_info *info);
+
 static void acpi_ex_dump_reference_obj(union acpi_operand_object *obj_desc);
 
 static void
@@ -119,7 +123,7 @@ static struct acpi_exdump_info acpi_ex_dump_event[2] = {
 
 static struct acpi_exdump_info acpi_ex_dump_method[8] = {
         {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_method), NULL},
-        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.param_count), "param_count"},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.param_count), "ParamCount"},
         {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.concurrency), "Concurrency"},
         {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(method.semaphore), "Semaphore"},
         {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.owner_id), "Owner Id"},
@@ -263,12 +267,10 @@ static struct acpi_exdump_info acpi_ex_dump_field_common[7] = {
         {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(common_field.node), "Parent Node"}
 };
 
-static struct acpi_exdump_info acpi_ex_dump_node[6] = {
+static struct acpi_exdump_info acpi_ex_dump_node[5] = {
         {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_node), NULL},
         {ACPI_EXD_UINT8, ACPI_EXD_NSOFFSET(flags), "Flags"},
         {ACPI_EXD_UINT8, ACPI_EXD_NSOFFSET(owner_id), "Owner Id"},
-        {ACPI_EXD_UINT16, ACPI_EXD_NSOFFSET(reference_count),
-         "Reference Count"},
         {ACPI_EXD_POINTER, ACPI_EXD_NSOFFSET(child), "Child List"},
         {ACPI_EXD_POINTER, ACPI_EXD_NSOFFSET(peer), "Next Peer"}
 };
@@ -330,7 +332,7 @@ acpi_ex_dump_object(union acpi_operand_object *obj_desc,
 
         if (!info) {
                 acpi_os_printf
-                    ("ex_dump_object: Display not implemented for object type %s\n",
+                    ("ExDumpObject: Display not implemented for object type %s\n",
                      acpi_ut_get_object_type_name(obj_desc));
                 return;
         }
@@ -454,7 +456,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
         u32 length;
         u32 index;
 
-        ACPI_FUNCTION_NAME("ex_dump_operand")
+        ACPI_FUNCTION_NAME(ex_dump_operand)
 
             if (!
                 ((ACPI_LV_EXEC & acpi_dbg_level)
@@ -463,6 +465,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
         }
 
         if (!obj_desc) {
+
                 /* This could be a null element of a package */
 
                 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Null Object Descriptor\n"));
@@ -522,7 +525,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
 
                 case AML_REF_OF_OP:
 
-                        acpi_os_printf("Reference: (ref_of) %p\n",
+                        acpi_os_printf("Reference: (RefOf) %p\n",
                                        obj_desc->reference.object);
                         break;
 
@@ -532,6 +535,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
                                        obj_desc->reference.offset);
 
                         if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
+
                                 /* Value is an Integer */
 
                                 acpi_os_printf(" value is [%8.8X%8.8x]",
@@ -610,7 +614,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
 
         case ACPI_TYPE_PACKAGE:
 
-                acpi_os_printf("Package [Len %X] element_array %p\n",
+                acpi_os_printf("Package [Len %X] ElementArray %p\n",
                                obj_desc->package.count,
                                obj_desc->package.elements);
 
@@ -662,13 +666,13 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
 
         case ACPI_TYPE_LOCAL_BANK_FIELD:
 
-                acpi_os_printf("bank_field\n");
+                acpi_os_printf("BankField\n");
                 break;
 
         case ACPI_TYPE_LOCAL_REGION_FIELD:
 
                 acpi_os_printf
-                    ("region_field: Bits=%X acc_width=%X Lock=%X Update=%X at byte=%X bit=%X of below:\n",
+                    ("RegionField: Bits=%X AccWidth=%X Lock=%X Update=%X at byte=%X bit=%X of below:\n",
                      obj_desc->field.bit_length,
                      obj_desc->field.access_byte_width,
                      obj_desc->field.field_flags & AML_FIELD_LOCK_RULE_MASK,
@@ -681,12 +685,12 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
 
         case ACPI_TYPE_LOCAL_INDEX_FIELD:
 
-                acpi_os_printf("index_field\n");
+                acpi_os_printf("IndexField\n");
                 break;
 
         case ACPI_TYPE_BUFFER_FIELD:
 
-                acpi_os_printf("buffer_field: %X bits at byte %X bit %X of\n",
+                acpi_os_printf("BufferField: %X bits at byte %X bit %X of\n",
                                obj_desc->buffer_field.bit_length,
                                obj_desc->buffer_field.base_byte_offset,
                                obj_desc->buffer_field.start_field_bit_offset);
@@ -777,7 +781,7 @@ acpi_ex_dump_operands(union acpi_operand_object **operands,
 {
         acpi_native_uint i;
 
-        ACPI_FUNCTION_NAME("ex_dump_operands");
+        ACPI_FUNCTION_NAME(ex_dump_operands);
 
         if (!ident) {
                 ident = "?";
@@ -901,7 +905,7 @@ static void acpi_ex_dump_reference_obj(union acpi_operand_object *obj_desc)
                         acpi_os_printf("Could not convert name to pathname\n");
                 } else {
                         acpi_os_printf("%s\n", (char *)ret_buf.pointer);
-                        ACPI_MEM_FREE(ret_buf.pointer);
+                        ACPI_FREE(ret_buf.pointer);
                 }
         } else if (obj_desc->reference.object) {
                 acpi_os_printf("\nReferenced Object: %p\n",
@@ -1017,7 +1021,7 @@ acpi_ex_dump_package_obj(union acpi_operand_object *obj_desc,
 void
 acpi_ex_dump_object_descriptor(union acpi_operand_object *obj_desc, u32 flags)
 {
-        ACPI_FUNCTION_TRACE("ex_dump_object_descriptor");
+        ACPI_FUNCTION_TRACE(ex_dump_object_descriptor);
 
         if (!obj_desc) {
                 return_VOID;
@@ -1046,7 +1050,7 @@ acpi_ex_dump_object_descriptor(union acpi_operand_object *obj_desc, u32 flags)
 
         if (ACPI_GET_DESCRIPTOR_TYPE(obj_desc) != ACPI_DESC_TYPE_OPERAND) {
                 acpi_os_printf
-                    ("ex_dump_object_descriptor: %p is not an ACPI operand object: [%s]\n",
+                    ("ExDumpObjectDescriptor: %p is not an ACPI operand object: [%s]\n",
                      obj_desc, acpi_ut_get_descriptor_name(obj_desc));
                 return_VOID;
         }