23 files changed, 157 insertions, 146 deletions
diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c
index e0deffb567..9c46f33386 100644
--- a/drivers/acpi/executer/exconfig.c
+++ b/drivers/acpi/executer/exconfig.c
@@ -82,7 +82,7 @@ acpi_ex_add_table(struct acpi_table_header *table,
        struct acpi_table_desc table_info;
        union acpi_operand_object *obj_desc;
-        ACPI_FUNCTION_TRACE("ex_add_table");
+        ACPI_FUNCTION_TRACE(ex_add_table);
        /* Create an object to be the table handle */
@@ -100,7 +100,7 @@ acpi_ex_add_table(struct acpi_table_header *table,
        ACPI_MEMSET(&table_info, 0, sizeof(struct acpi_table_desc));
-        table_info.type = ACPI_TABLE_SSDT;
+        table_info.type = ACPI_TABLE_ID_SSDT;
        table_info.pointer = table;
        table_info.length = (acpi_size) table->length;
        table_info.allocation = ACPI_MEM_ALLOCATED;
@@ -162,7 +162,7 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
        struct acpi_namespace_node *parameter_node = NULL;
        union acpi_operand_object *ddb_handle;
-        ACPI_FUNCTION_TRACE("ex_load_table_op");
+        ACPI_FUNCTION_TRACE(ex_load_table_op);
 #if 0
        /*
@@ -300,7 +300,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
        struct acpi_table_header table_header;
        u32 i;
-        ACPI_FUNCTION_TRACE("ex_load_op");
+        ACPI_FUNCTION_TRACE(ex_load_op);
        /* Object can be either an op_region or a Field */
@@ -411,12 +411,8 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
        /* The table must be either an SSDT or a PSDT */
-        if ((!ACPI_STRNCMP(table_ptr->signature,
+        if ((!ACPI_COMPARE_NAME(table_ptr->signature, PSDT_SIG)) &&
-                           acpi_gbl_table_data[ACPI_TABLE_PSDT].signature,
+            (!ACPI_COMPARE_NAME(table_ptr->signature, SSDT_SIG))) {
-                           acpi_gbl_table_data[ACPI_TABLE_PSDT].sig_length)) &&
-            (!ACPI_STRNCMP(table_ptr->signature,
-                           acpi_gbl_table_data[ACPI_TABLE_SSDT].signature,
-                           acpi_gbl_table_data[ACPI_TABLE_SSDT].sig_length))) {
                ACPI_ERROR((AE_INFO,
                            "Table has invalid signature [%4.4s], must be SSDT or PSDT",
                            table_ptr->signature));
@@ -470,7 +466,7 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle)
        union acpi_operand_object *table_desc = ddb_handle;
        struct acpi_table_desc *table_info;
-        ACPI_FUNCTION_TRACE("ex_unload_table");
+        ACPI_FUNCTION_TRACE(ex_unload_table);
        /*
         * Validate the handle
diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c
index a2c93c9ba0..b732e399b1 100644
--- a/drivers/acpi/executer/exconvrt.c
+++ b/drivers/acpi/executer/exconvrt.c
@@ -79,7 +79,7 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc,
        u32 count;
        acpi_status status;
-        ACPI_FUNCTION_TRACE_PTR("ex_convert_to_integer", obj_desc);
+        ACPI_FUNCTION_TRACE_PTR(ex_convert_to_integer, obj_desc);
        switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
        case ACPI_TYPE_INTEGER:
@@ -199,7 +199,7 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,
        union acpi_operand_object *return_desc;
        u8 *new_buf;
-        ACPI_FUNCTION_TRACE_PTR("ex_convert_to_buffer", obj_desc);
+        ACPI_FUNCTION_TRACE_PTR(ex_convert_to_buffer, obj_desc);
        switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
        case ACPI_TYPE_BUFFER:
@@ -402,7 +402,7 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
        u16 base = 16;
        u8 separator = ',';
-        ACPI_FUNCTION_TRACE_PTR("ex_convert_to_string", obj_desc);
+        ACPI_FUNCTION_TRACE_PTR(ex_convert_to_string, obj_desc);
        switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
        case ACPI_TYPE_STRING:
@@ -569,7 +569,7 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,
 {
        acpi_status status = AE_OK;
-        ACPI_FUNCTION_TRACE("ex_convert_to_target_type");
+        ACPI_FUNCTION_TRACE(ex_convert_to_target_type);
        /* Default behavior */
@@ -659,7 +659,7 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,
        default:
                ACPI_ERROR((AE_INFO,
-                            "Unknown Target type ID 0x%X aml_opcode %X dest_type %s",
+                            "Unknown Target type ID 0x%X AmlOpcode %X DestType %s",
                            GET_CURRENT_ARG_TYPE(walk_state->op_info->
                                                 runtime_args),
                            walk_state->opcode,
diff --git a/drivers/acpi/executer/excreate.c b/drivers/acpi/executer/excreate.c
index 763e132da4..106dc7219d 100644
--- a/drivers/acpi/executer/excreate.c
+++ b/drivers/acpi/executer/excreate.c
@@ -69,7 +69,7 @@ acpi_status acpi_ex_create_alias(struct acpi_walk_state *walk_state)
        struct acpi_namespace_node *alias_node;
        acpi_status status = AE_OK;
-        ACPI_FUNCTION_TRACE("ex_create_alias");
+        ACPI_FUNCTION_TRACE(ex_create_alias);
        /* Get the source/alias operands (both namespace nodes) */
@@ -164,7 +164,7 @@ acpi_status acpi_ex_create_event(struct acpi_walk_state *walk_state)
        acpi_status status;
        union acpi_operand_object *obj_desc;
-        ACPI_FUNCTION_TRACE("ex_create_event");
+        ACPI_FUNCTION_TRACE(ex_create_event);
        obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_EVENT);
        if (!obj_desc) {
@@ -216,7 +216,7 @@ acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state)
        acpi_status status = AE_OK;
        union acpi_operand_object *obj_desc;
-        ACPI_FUNCTION_TRACE_PTR("ex_create_mutex", ACPI_WALK_OPERANDS);
+        ACPI_FUNCTION_TRACE_PTR(ex_create_mutex, ACPI_WALK_OPERANDS);
        /* Create the new mutex object */
@@ -281,7 +281,7 @@ acpi_ex_create_region(u8 * aml_start,
        struct acpi_namespace_node *node;
        union acpi_operand_object *region_obj2;
-        ACPI_FUNCTION_TRACE("ex_create_region");
+        ACPI_FUNCTION_TRACE(ex_create_region);
        /* Get the Namespace Node */
@@ -301,7 +301,7 @@ acpi_ex_create_region(u8 * aml_start,
         */
        if ((region_space >= ACPI_NUM_PREDEFINED_REGIONS) &&
            (region_space < ACPI_USER_REGION_BEGIN)) {
-                ACPI_ERROR((AE_INFO, "Invalid address_space type %X",
+                ACPI_ERROR((AE_INFO, "Invalid AddressSpace type %X",
                            region_space));
                return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID);
        }
@@ -365,7 +365,7 @@ acpi_status acpi_ex_create_table_region(struct acpi_walk_state *walk_state)
        struct acpi_table_header *table;
        union acpi_operand_object *region_obj2;
-        ACPI_FUNCTION_TRACE("ex_create_table_region");
+        ACPI_FUNCTION_TRACE(ex_create_table_region);
        /* Get the Node from the object stack  */
@@ -453,7 +453,7 @@ acpi_status acpi_ex_create_processor(struct acpi_walk_state *walk_state)
        union acpi_operand_object *obj_desc;
        acpi_status status;
-        ACPI_FUNCTION_TRACE_PTR("ex_create_processor", walk_state);
+        ACPI_FUNCTION_TRACE_PTR(ex_create_processor, walk_state);
        /* Create the processor object */
@@ -500,7 +500,7 @@ acpi_status acpi_ex_create_power_resource(struct acpi_walk_state *walk_state)
        acpi_status status;
        union acpi_operand_object *obj_desc;
-        ACPI_FUNCTION_TRACE_PTR("ex_create_power_resource", walk_state);
+        ACPI_FUNCTION_TRACE_PTR(ex_create_power_resource, walk_state);
        /* Create the power resource object */
@@ -550,7 +550,7 @@ acpi_ex_create_method(u8 * aml_start,
        acpi_status status;
        u8 method_flags;
-        ACPI_FUNCTION_TRACE_PTR("ex_create_method", walk_state);
+        ACPI_FUNCTION_TRACE_PTR(ex_create_method, walk_state);
        /* Create a new method object */
diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c
index 1dfebf9e70..7b9718e976 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/executer/exdump.c
@@ -123,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"},
@@ -332,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;
        }
@@ -456,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)
@@ -525,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;
@@ -614,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);
@@ -666,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,
@@ -685,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);
@@ -781,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 = "?";
@@ -1021,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;
@@ -1050,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;
        }
diff --git a/drivers/acpi/executer/exfield.c b/drivers/acpi/executer/exfield.c
index 36c265a00c..9ea9c3a67c 100644
--- a/drivers/acpi/executer/exfield.c
+++ b/drivers/acpi/executer/exfield.c
@@ -73,7 +73,7 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
        void *buffer;
        u8 locked;
-        ACPI_FUNCTION_TRACE_PTR("ex_read_data_from_field", obj_desc);
+        ACPI_FUNCTION_TRACE_PTR(ex_read_data_from_field, obj_desc);
        /* Parameter validation */
@@ -164,11 +164,11 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
        }
        ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
-                          "field_read [TO]:  Obj %p, Type %X, Buf %p, byte_len %X\n",
+                          "FieldRead [TO]:   Obj %p, Type %X, Buf %p, ByteLen %X\n",
                          obj_desc, ACPI_GET_OBJECT_TYPE(obj_desc), buffer,
                          (u32) length));
        ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
-                          "field_read [FROM]: bit_len %X, bit_off %X, byte_off %X\n",
+                          "FieldRead [FROM]: BitLen %X, BitOff %X, ByteOff %X\n",
                          obj_desc->common_field.bit_length,
                          obj_desc->common_field.start_field_bit_offset,
                          obj_desc->common_field.base_byte_offset));
@@ -220,7 +220,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
        u8 locked;
        union acpi_operand_object *buffer_desc;
-        ACPI_FUNCTION_TRACE_PTR("ex_write_data_to_field", obj_desc);
+        ACPI_FUNCTION_TRACE_PTR(ex_write_data_to_field, obj_desc);
        /* Parameter validation */
@@ -349,14 +349,14 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
        }
        ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
-                          "field_write [FROM]: Obj %p (%s:%X), Buf %p, byte_len %X\n",
+                          "FieldWrite [FROM]: Obj %p (%s:%X), Buf %p, ByteLen %X\n",
                          source_desc,
                          acpi_ut_get_type_name(ACPI_GET_OBJECT_TYPE
                                                (source_desc)),
                          ACPI_GET_OBJECT_TYPE(source_desc), buffer, length));
        ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
-                          "field_write [TO]:  Obj %p (%s:%X), bit_len %X, bit_off %X, byte_off %X\n",
+                          "FieldWrite [TO]:   Obj %p (%s:%X), BitLen %X, BitOff %X, ByteOff %X\n",
                          obj_desc,
                          acpi_ut_get_type_name(ACPI_GET_OBJECT_TYPE(obj_desc)),
                          ACPI_GET_OBJECT_TYPE(obj_desc),
diff --git a/drivers/acpi/executer/exfldio.c b/drivers/acpi/executer/exfldio.c
index d5a4b2627c..ca9925c0d0 100644
--- a/drivers/acpi/executer/exfldio.c
+++ b/drivers/acpi/executer/exfldio.c
@@ -87,7 +87,7 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
        acpi_status status = AE_OK;
        union acpi_operand_object *rgn_desc;
-        ACPI_FUNCTION_TRACE_U32("ex_setup_region", field_datum_byte_offset);
+        ACPI_FUNCTION_TRACE_U32(ex_setup_region, field_datum_byte_offset);
        rgn_desc = obj_desc->common_field.region_obj;
@@ -112,6 +112,16 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
                }
        }
+        /* Exit if Address/Length have been disallowed by the host OS */
+        if (rgn_desc->common.flags & AOPOBJ_INVALID) {
+                return_ACPI_STATUS(AE_AML_ILLEGAL_ADDRESS);
+        }
+        /*
+         * Exit now for SMBus address space, it has a non-linear address space
+         * and the request cannot be directly validated
+         */
        if (rgn_desc->region.space_id == ACPI_ADR_SPACE_SMBUS) {
                /* SMBus has a non-linear address space */
@@ -218,7 +228,7 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
        union acpi_operand_object *rgn_desc;
        acpi_physical_address address;
-        ACPI_FUNCTION_TRACE("ex_access_region");
+        ACPI_FUNCTION_TRACE(ex_access_region);
        /*
         * Ensure that the region operands are fully evaluated and verify
@@ -247,7 +257,7 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
        }
        ACPI_DEBUG_PRINT_RAW((ACPI_DB_BFIELD,
-                              " Region [%s:%X], Width %X, byte_base %X, Offset %X at %8.8X%8.8X\n",
+                              " Region [%s:%X], Width %X, ByteBase %X, Offset %X at %8.8X%8.8X\n",
                              acpi_ut_get_region_name(rgn_desc->region.
                                                      space_id),
                              rgn_desc->region.space_id,
@@ -353,7 +363,7 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
        acpi_status status;
        acpi_integer local_value;
-        ACPI_FUNCTION_TRACE_U32("ex_field_datum_io", field_datum_byte_offset);
+        ACPI_FUNCTION_TRACE_U32(ex_field_datum_io, field_datum_byte_offset);
        if (read_write == ACPI_READ) {
                if (!value) {
@@ -488,7 +498,7 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
                }
                ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
-                                  "I/O to Data Register: value_ptr %p\n",
+                                  "I/O to Data Register: ValuePtr %p\n",
                                  value));
                if (read_write == ACPI_READ) {
@@ -561,7 +571,7 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
        acpi_integer merged_value;
        acpi_integer current_value;
-        ACPI_FUNCTION_TRACE_U32("ex_write_with_update_rule", mask);
+        ACPI_FUNCTION_TRACE_U32(ex_write_with_update_rule, mask);
        /* Start with the new bits  */
@@ -617,7 +627,7 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
                default:
                        ACPI_ERROR((AE_INFO,
-                                    "Unknown update_rule value: %X",
+                                    "Unknown UpdateRule value: %X",
                                    (obj_desc->common_field.
                                     field_flags &
                                     AML_FIELD_UPDATE_RULE_MASK)));
@@ -626,7 +636,7 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
        }
        ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
-                          "Mask %8.8X%8.8X, datum_offset %X, Width %X, Value %8.8X%8.8X, merged_value %8.8X%8.8X\n",
+                          "Mask %8.8X%8.8X, DatumOffset %X, Width %X, Value %8.8X%8.8X, MergedValue %8.8X%8.8X\n",
                          ACPI_FORMAT_UINT64(mask),
                          field_datum_byte_offset,
                          obj_desc->common_field.access_byte_width,
@@ -669,7 +679,7 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
        u32 field_datum_count;
        u32 i;
-        ACPI_FUNCTION_TRACE("ex_extract_from_field");
+        ACPI_FUNCTION_TRACE(ex_extract_from_field);
        /* Validate target buffer and clear it */
@@ -784,7 +794,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
        u32 field_datum_count;
        u32 i;
-        ACPI_FUNCTION_TRACE("ex_insert_into_field");
+        ACPI_FUNCTION_TRACE(ex_insert_into_field);
        /* Validate input buffer */
diff --git a/drivers/acpi/executer/exmisc.c b/drivers/acpi/executer/exmisc.c
index 74f2c1a9bd..794d9b8de9 100644
--- a/drivers/acpi/executer/exmisc.c
+++ b/drivers/acpi/executer/exmisc.c
@@ -72,7 +72,7 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
        union acpi_operand_object *reference_obj;
        union acpi_operand_object *referenced_obj;
-        ACPI_FUNCTION_TRACE_PTR("ex_get_object_reference", obj_desc);
+        ACPI_FUNCTION_TRACE_PTR(ex_get_object_reference, obj_desc);
        *return_desc = NULL;
@@ -168,7 +168,7 @@ acpi_ex_concat_template(union acpi_operand_object *operand0,
        acpi_size length1;
        acpi_size new_length;
-        ACPI_FUNCTION_TRACE("ex_concat_template");
+        ACPI_FUNCTION_TRACE(ex_concat_template);
        /*
         * Find the end_tag descriptor in each resource template.
@@ -250,7 +250,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
        char *new_buf;
        acpi_status status;
-        ACPI_FUNCTION_TRACE("ex_do_concatenate");
+        ACPI_FUNCTION_TRACE(ex_do_concatenate);
        /*
         * Convert the second operand if necessary.  The first operand
@@ -489,7 +489,7 @@ acpi_ex_do_logical_numeric_op(u16 opcode,
        acpi_status status = AE_OK;
        u8 local_result = FALSE;
-        ACPI_FUNCTION_TRACE("ex_do_logical_numeric_op");
+        ACPI_FUNCTION_TRACE(ex_do_logical_numeric_op);
        switch (opcode) {
        case AML_LAND_OP:       /* LAnd (Integer0, Integer1) */
@@ -557,7 +557,7 @@ acpi_ex_do_logical_op(u16 opcode,
        u8 local_result = FALSE;
        int compare;
-        ACPI_FUNCTION_TRACE("ex_do_logical_op");
+        ACPI_FUNCTION_TRACE(ex_do_logical_op);
        /*
         * Convert the second operand if necessary.  The first operand
diff --git a/drivers/acpi/executer/exmutex.c b/drivers/acpi/executer/exmutex.c
index eaee1de5e9..93098d68ca 100644
--- a/drivers/acpi/executer/exmutex.c
+++ b/drivers/acpi/executer/exmutex.c
@@ -61,7 +61,7 @@ acpi_ex_link_mutex(union acpi_operand_object *obj_desc,
 *
 * RETURN:      None
 *
- * DESCRIPTION: Remove a mutex from the "acquired_mutex" list
+ * DESCRIPTION: Remove a mutex from the "AcquiredMutex" list
 *
 ******************************************************************************/
@@ -95,7 +95,7 @@ void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc)
 *
 * RETURN:      None
 *
- * DESCRIPTION: Add a mutex to the "acquired_mutex" list for this walk
+ * DESCRIPTION: Add a mutex to the "AcquiredMutex" list for this walk
 *
 ******************************************************************************/
@@ -144,7 +144,7 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
 {
        acpi_status status;
-        ACPI_FUNCTION_TRACE_PTR("ex_acquire_mutex", obj_desc);
+        ACPI_FUNCTION_TRACE_PTR(ex_acquire_mutex, obj_desc);
        if (!obj_desc) {
                return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -165,7 +165,7 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
         */
        if (walk_state->thread->current_sync_level > obj_desc->mutex.sync_level) {
                ACPI_ERROR((AE_INFO,
-                            "Cannot acquire Mutex [%4.4s], incorrect sync_level",
+                            "Cannot acquire Mutex [%4.4s], incorrect SyncLevel",
                            acpi_ut_get_node_name(obj_desc->mutex.node)));
                return_ACPI_STATUS(AE_AML_MUTEX_ORDER);
        }
@@ -234,7 +234,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
 {
        acpi_status status;
-        ACPI_FUNCTION_TRACE("ex_release_mutex");
+        ACPI_FUNCTION_TRACE(ex_release_mutex);
        if (!obj_desc) {
                return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -279,7 +279,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
         */
        if (obj_desc->mutex.sync_level > walk_state->thread->current_sync_level) {
                ACPI_ERROR((AE_INFO,
-                            "Cannot release Mutex [%4.4s], incorrect sync_level",
+                            "Cannot release Mutex [%4.4s], incorrect SyncLevel",
                            acpi_ut_get_node_name(obj_desc->mutex.node)));
                return_ACPI_STATUS(AE_AML_MUTEX_ORDER);
        }
diff --git a/drivers/acpi/executer/exnames.c b/drivers/acpi/executer/exnames.c
index 085b18f8dd..d3d7036462 100644
--- a/drivers/acpi/executer/exnames.c
+++ b/drivers/acpi/executer/exnames.c
@@ -77,7 +77,7 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)
        char *name_string;
        u32 size_needed;
-        ACPI_FUNCTION_TRACE("ex_allocate_name_string");
+        ACPI_FUNCTION_TRACE(ex_allocate_name_string);
        /*
         * Allow room for all \ and ^ prefixes, all segments and a multi_name_prefix.
@@ -162,7 +162,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
        u32 index;
        char char_buf[5];
-        ACPI_FUNCTION_TRACE("ex_name_segment");
+        ACPI_FUNCTION_TRACE(ex_name_segment);
        /*
         * If first character is a digit, then we know that we aren't looking at a
@@ -253,7 +253,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
        u32 prefix_count = 0;
        u8 has_prefix = FALSE;
-        ACPI_FUNCTION_TRACE_PTR("ex_get_name_string", aml_address);
+        ACPI_FUNCTION_TRACE_PTR(ex_get_name_string, aml_address);
        if (ACPI_TYPE_LOCAL_REGION_FIELD == data_type ||
            ACPI_TYPE_LOCAL_BANK_FIELD == data_type ||
@@ -277,7 +277,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
                case AML_ROOT_PREFIX:
                        ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
-                                          "root_prefix(\\) at %p\n",
+                                          "RootPrefix(\\) at %p\n",
                                          aml_address));
                        /*
@@ -295,7 +295,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
                        do {
                                ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
-                                                  "parent_prefix (^) at %p\n",
+                                                  "ParentPrefix (^) at %p\n",
                                                  aml_address));
                                aml_address++;
@@ -319,7 +319,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
                case AML_DUAL_NAME_PREFIX:
                        ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
-                                          "dual_name_prefix at %p\n",
+                                          "DualNamePrefix at %p\n",
                                          aml_address));
                        aml_address++;
@@ -346,7 +346,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
                case AML_MULTI_NAME_PREFIX_OP:
                        ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
-                                          "multi_name_prefix at %p\n",
+                                          "MultiNamePrefix at %p\n",
                                          aml_address));
                        /* Fetch count of segments remaining in name path */
@@ -382,7 +382,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
                        if (prefix_count == ACPI_UINT32_MAX) {
                                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                                  "name_seg is \"\\\" followed by NULL\n"));
+                                                  "NameSeg is \"\\\" followed by NULL\n"));
                        }
                        /* Consume the NULL byte */
diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c
index d00f766246..05b89c5878 100644
--- a/drivers/acpi/executer/exoparg1.c
+++ b/drivers/acpi/executer/exoparg1.c
@@ -89,7 +89,7 @@ acpi_status acpi_ex_opcode_0A_0T_1R(struct acpi_walk_state *walk_state)
        acpi_status status = AE_OK;
        union acpi_operand_object *return_desc = NULL;
-        ACPI_FUNCTION_TRACE_STR("ex_opcode_0A_0T_1R",
+        ACPI_FUNCTION_TRACE_STR(ex_opcode_0A_0T_1R,
                                acpi_ps_get_opcode_name(walk_state->opcode));
        /* Examine the AML opcode */
@@ -150,7 +150,7 @@ acpi_status acpi_ex_opcode_1A_0T_0R(struct acpi_walk_state *walk_state)
        union acpi_operand_object **operand = &walk_state->operands[0];
        acpi_status status = AE_OK;
-        ACPI_FUNCTION_TRACE_STR("ex_opcode_1A_0T_0R",
+        ACPI_FUNCTION_TRACE_STR(ex_opcode_1A_0T_0R,
                                acpi_ps_get_opcode_name(walk_state->opcode));
        /* Examine the AML opcode */
@@ -216,7 +216,7 @@ acpi_status acpi_ex_opcode_1A_1T_0R(struct acpi_walk_state *walk_state)
        acpi_status status = AE_OK;
        union acpi_operand_object **operand = &walk_state->operands[0];
-        ACPI_FUNCTION_TRACE_STR("ex_opcode_1A_1T_0R",
+        ACPI_FUNCTION_TRACE_STR(ex_opcode_1A_1T_0R,
                                acpi_ps_get_opcode_name(walk_state->opcode));
        /* Examine the AML opcode */
@@ -264,7 +264,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
        acpi_integer power_of_ten;
        acpi_integer digit;
-        ACPI_FUNCTION_TRACE_STR("ex_opcode_1A_1T_1R",
+        ACPI_FUNCTION_TRACE_STR(ex_opcode_1A_1T_1R,
                                acpi_ps_get_opcode_name(walk_state->opcode));
        /* Examine the AML opcode */
@@ -590,7 +590,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
        u32 type;
        acpi_integer value;
-        ACPI_FUNCTION_TRACE_STR("ex_opcode_1A_0T_1R",
+        ACPI_FUNCTION_TRACE_STR(ex_opcode_1A_0T_1R,
                                acpi_ps_get_opcode_name(walk_state->opcode));
        /* Examine the AML opcode */
@@ -975,7 +975,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                                default:
                                        ACPI_ERROR((AE_INFO,
-                                                    "Unknown Index target_type %X in obj %p",
+                                                    "Unknown Index TargetType %X in obj %p",
                                                    operand[0]->reference.
                                                    target_type, operand[0]));
                                        status = AE_AML_OPERAND_TYPE;
diff --git a/drivers/acpi/executer/exoparg2.c b/drivers/acpi/executer/exoparg2.c
index 690e43db0a..7d2cbc1131 100644
--- a/drivers/acpi/executer/exoparg2.c
+++ b/drivers/acpi/executer/exoparg2.c
@@ -92,7 +92,7 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)
        u32 value;
        acpi_status status = AE_OK;
-        ACPI_FUNCTION_TRACE_STR("ex_opcode_2A_0T_0R",
+        ACPI_FUNCTION_TRACE_STR(ex_opcode_2A_0T_0R,
                                acpi_ps_get_opcode_name(walk_state->opcode));
        /* Examine the opcode */
@@ -121,7 +121,7 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)
 #ifdef ACPI_GPE_NOTIFY_CHECK
                /*
                 * GPE method wake/notify check.  Here, we want to ensure that we
-                 * don't receive any "device_wake" Notifies from a GPE _Lxx or _Exx
+                 * don't receive any "DeviceWake" Notifies from a GPE _Lxx or _Exx
                 * GPE method during system runtime.  If we do, the GPE is marked
                 * as "wake-only" and disabled.
                 *
@@ -186,7 +186,7 @@ acpi_status acpi_ex_opcode_2A_2T_1R(struct acpi_walk_state *walk_state)
        union acpi_operand_object *return_desc2 = NULL;
        acpi_status status;
-        ACPI_FUNCTION_TRACE_STR("ex_opcode_2A_2T_1R",
+        ACPI_FUNCTION_TRACE_STR(ex_opcode_2A_2T_1R,
                                acpi_ps_get_opcode_name(walk_state->opcode));
        /* Execute the opcode */
@@ -283,7 +283,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
        acpi_status status = AE_OK;
        acpi_size length;
-        ACPI_FUNCTION_TRACE_STR("ex_opcode_2A_1T_1R",
+        ACPI_FUNCTION_TRACE_STR(ex_opcode_2A_1T_1R,
                                acpi_ps_get_opcode_name(walk_state->opcode));
        /* Execute the opcode */
@@ -514,7 +514,7 @@ acpi_status acpi_ex_opcode_2A_0T_1R(struct acpi_walk_state *walk_state)
        acpi_status status = AE_OK;
        u8 logical_result = FALSE;
-        ACPI_FUNCTION_TRACE_STR("ex_opcode_2A_0T_1R",
+        ACPI_FUNCTION_TRACE_STR(ex_opcode_2A_0T_1R,
                                acpi_ps_get_opcode_name(walk_state->opcode));
        /* Create the internal return object */
diff --git a/drivers/acpi/executer/exoparg3.c b/drivers/acpi/executer/exoparg3.c
index 4897e6c343..e2d945dfd5 100644
--- a/drivers/acpi/executer/exoparg3.c
+++ b/drivers/acpi/executer/exoparg3.c
@@ -88,14 +88,14 @@ 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));
@@ -150,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) {
diff --git a/drivers/acpi/executer/exoparg6.c b/drivers/acpi/executer/exoparg6.c
index 33e4fb1add..f0c0ba6eb4 100644
--- a/drivers/acpi/executer/exoparg6.c
+++ b/drivers/acpi/executer/exoparg6.c
@@ -220,7 +220,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
        acpi_integer index;
        union acpi_operand_object *this_element;
-        ACPI_FUNCTION_TRACE_STR("ex_opcode_6A_0T_1R",
+        ACPI_FUNCTION_TRACE_STR(ex_opcode_6A_0T_1R,
                                acpi_ps_get_opcode_name(walk_state->opcode));
        switch (walk_state->opcode) {
diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c
index 916234bf81..44d064f427 100644
--- a/drivers/acpi/executer/exprep.c
+++ b/drivers/acpi/executer/exprep.c
@@ -97,7 +97,7 @@ acpi_ex_generate_access(u32 field_bit_offset,
        u32 minimum_accesses = 0xFFFFFFFF;
        u32 accesses;
-        ACPI_FUNCTION_TRACE("ex_generate_access");
+        ACPI_FUNCTION_TRACE(ex_generate_access);
        /* Round Field start offset and length to "minimal" byte boundaries */
@@ -146,7 +146,7 @@ acpi_ex_generate_access(u32 field_bit_offset,
                        accesses = field_end_offset - field_start_offset;
                        ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
-                                          "access_width %d end is within region\n",
+                                          "AccessWidth %d end is within region\n",
                                          access_byte_width));
                        ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
@@ -173,7 +173,7 @@ acpi_ex_generate_access(u32 field_bit_offset,
                        }
                } else {
                        ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
-                                          "access_width %d end is NOT within region\n",
+                                          "AccessWidth %d end is NOT within region\n",
                                          access_byte_width));
                        if (access_byte_width == 1) {
                                ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
@@ -228,7 +228,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
        u32 byte_alignment;
        u32 bit_length;
-        ACPI_FUNCTION_TRACE("ex_decode_field_access");
+        ACPI_FUNCTION_TRACE(ex_decode_field_access);
        access = (field_flags & AML_FIELD_ACCESS_TYPE_MASK);
@@ -322,7 +322,7 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc,
        u32 byte_alignment;
        u32 nearest_byte_address;
-        ACPI_FUNCTION_TRACE("ex_prep_common_field_object");
+        ACPI_FUNCTION_TRACE(ex_prep_common_field_object);
        /*
         * Note: the structure being initialized is the
@@ -415,13 +415,13 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
        u32 type;
        acpi_status status;
-        ACPI_FUNCTION_TRACE("ex_prep_field_value");
+        ACPI_FUNCTION_TRACE(ex_prep_field_value);
        /* Parameter validation */
        if (info->field_type != ACPI_TYPE_LOCAL_INDEX_FIELD) {
                if (!info->region_node) {
-                        ACPI_ERROR((AE_INFO, "Null region_node"));
+                        ACPI_ERROR((AE_INFO, "Null RegionNode"));
                        return_ACPI_STATUS(AE_AML_NO_OPERAND);
                }
@@ -467,7 +467,7 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
                acpi_ut_add_reference(obj_desc->field.region_obj);
                ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
-                                  "region_field: bit_off %X, Off %X, Gran %X, Region %p\n",
+                                  "RegionField: BitOff %X, Off %X, Gran %X, Region %p\n",
                                  obj_desc->field.start_field_bit_offset,
                                  obj_desc->field.base_byte_offset,
                                  obj_desc->field.access_byte_width,
@@ -488,7 +488,7 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
                acpi_ut_add_reference(obj_desc->bank_field.bank_obj);
                ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
-                                  "Bank Field: bit_off %X, Off %X, Gran %X, Region %p, bank_reg %p\n",
+                                  "Bank Field: BitOff %X, Off %X, Gran %X, Region %p, BankReg %p\n",
                                  obj_desc->bank_field.start_field_bit_offset,
                                  obj_desc->bank_field.base_byte_offset,
                                  obj_desc->field.access_byte_width,
@@ -519,23 +519,29 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
                acpi_ut_add_reference(obj_desc->index_field.index_obj);
                /*
-                 * February 2006: Changed to match MS behavior
+                 * April 2006: Changed to match MS behavior
                 *
                 * The value written to the Index register is the byte offset of the
-                 * target field.
+                 * target field in units of the granularity of the index_field
                 *
                 * Previously, the value was calculated as an index in terms of the
                 * width of the Data register, as below:
                 *
-                 *   obj_desc->index_field.Value = (u32)
+                 *      obj_desc->index_field.Value = (u32)
-                 *       (Info->field_bit_position / ACPI_MUL_8 (
+                 *          (Info->field_bit_position / ACPI_MUL_8 (
-                 *           obj_desc->Field.access_byte_width));
+                 *              obj_desc->Field.access_byte_width));
+                 *
+                 * February 2006: Tried value as a byte offset:
+                 *      obj_desc->index_field.Value = (u32)
+                 *          ACPI_DIV_8 (Info->field_bit_position);
                 */
                obj_desc->index_field.value =
-                    (u32) ACPI_DIV_8(info->field_bit_position);
+                    (u32) ACPI_ROUND_DOWN(ACPI_DIV_8(info->field_bit_position),
+                                          obj_desc->index_field.
+                                          access_byte_width);
                ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
-                                  "index_field: bit_off %X, Off %X, Value %X, Gran %X, Index %p, Data %p\n",
+                                  "IndexField: BitOff %X, Off %X, Value %X, Gran %X, Index %p, Data %p\n",
                                  obj_desc->index_field.start_field_bit_offset,
                                  obj_desc->index_field.base_byte_offset,
                                  obj_desc->index_field.value,
@@ -557,7 +563,7 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
                                       acpi_ns_get_type(info->field_node));
        ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
-                          "Set named_obj %p [%4.4s], obj_desc %p\n",
+                          "Set NamedObj %p [%4.4s], ObjDesc %p\n",
                          info->field_node,
                          acpi_ut_get_node_name(info->field_node), obj_desc));
diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c
index fdeda7beae..4fba452a55 100644
--- a/drivers/acpi/executer/exregion.c
+++ b/drivers/acpi/executer/exregion.c
@@ -81,7 +81,7 @@ acpi_ex_system_memory_space_handler(u32 function,
        u32 remainder;
 #endif
-        ACPI_FUNCTION_TRACE("ex_system_memory_space_handler");
+        ACPI_FUNCTION_TRACE(ex_system_memory_space_handler);
        /* Validate and translate the bit width */
@@ -103,7 +103,7 @@ acpi_ex_system_memory_space_handler(u32 function,
                break;
        default:
-                ACPI_ERROR((AE_INFO, "Invalid system_memory width %d",
+                ACPI_ERROR((AE_INFO, "Invalid SystemMemory width %d",
                            bit_width));
                return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
        }
@@ -284,7 +284,7 @@ acpi_ex_system_io_space_handler(u32 function,
        acpi_status status = AE_OK;
        u32 value32;
-        ACPI_FUNCTION_TRACE("ex_system_io_space_handler");
+        ACPI_FUNCTION_TRACE(ex_system_io_space_handler);
        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                          "System-IO (width %d) R/W %d Address=%8.8X%8.8X\n",
@@ -343,7 +343,7 @@ acpi_ex_pci_config_space_handler(u32 function,
        struct acpi_pci_id *pci_id;
        u16 pci_register;
-        ACPI_FUNCTION_TRACE("ex_pci_config_space_handler");
+        ACPI_FUNCTION_TRACE(ex_pci_config_space_handler);
        /*
         *  The arguments to acpi_os(Read|Write)pci_configuration are:
@@ -415,7 +415,7 @@ acpi_ex_cmos_space_handler(u32 function,
 {
        acpi_status status = AE_OK;
-        ACPI_FUNCTION_TRACE("ex_cmos_space_handler");
+        ACPI_FUNCTION_TRACE(ex_cmos_space_handler);
        return_ACPI_STATUS(status);
 }
@@ -447,7 +447,7 @@ acpi_ex_pci_bar_space_handler(u32 function,
 {
        acpi_status status = AE_OK;
-        ACPI_FUNCTION_TRACE("ex_pci_bar_space_handler");
+        ACPI_FUNCTION_TRACE(ex_pci_bar_space_handler);
        return_ACPI_STATUS(status);
 }
@@ -482,7 +482,7 @@ acpi_ex_data_table_space_handler(u32 function,
        u32 i;
        char *logical_addr_ptr;
-        ACPI_FUNCTION_TRACE("ex_data_table_space_handler");
+        ACPI_FUNCTION_TRACE(ex_data_table_space_handler);
        logical_addr_ptr = ACPI_PHYSADDR_TO_PTR(address);
diff --git a/drivers/acpi/executer/exresnte.c b/drivers/acpi/executer/exresnte.c
index 417d914d9e..f9b9f50085 100644
--- a/drivers/acpi/executer/exresnte.c
+++ b/drivers/acpi/executer/exresnte.c
@@ -87,7 +87,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
        struct acpi_namespace_node *node;
        acpi_object_type entry_type;
-        ACPI_FUNCTION_TRACE("ex_resolve_node_to_value");
+        ACPI_FUNCTION_TRACE(ex_resolve_node_to_value);
        /*
         * The stack pointer points to a struct acpi_namespace_node (Node).  Get the
@@ -97,7 +97,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
        source_desc = acpi_ns_get_attached_object(node);
        entry_type = acpi_ns_get_type((acpi_handle) node);
-        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Entry=%p source_desc=%p [%s]\n",
+        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Entry=%p SourceDesc=%p [%s]\n",
                          node, source_desc,
                          acpi_ut_get_type_name(entry_type)));
@@ -202,7 +202,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
        case ACPI_TYPE_LOCAL_INDEX_FIELD:
                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "field_read Node=%p source_desc=%p Type=%X\n",
+                                  "FieldRead Node=%p SourceDesc=%p Type=%X\n",
                                  node, source_desc, entry_type));
                status =
diff --git a/drivers/acpi/executer/exresolv.c b/drivers/acpi/executer/exresolv.c
index 22dabdd106..006bba035d 100644
--- a/drivers/acpi/executer/exresolv.c
+++ b/drivers/acpi/executer/exresolv.c
@@ -78,7 +78,7 @@ acpi_ex_resolve_to_value(union acpi_operand_object **stack_ptr,
 {
        acpi_status status;
-        ACPI_FUNCTION_TRACE_PTR("ex_resolve_to_value", stack_ptr);
+        ACPI_FUNCTION_TRACE_PTR(ex_resolve_to_value, stack_ptr);
        if (!stack_ptr || !*stack_ptr) {
                ACPI_ERROR((AE_INFO, "Internal - null pointer"));
@@ -144,7 +144,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
        union acpi_operand_object *obj_desc;
        u16 opcode;
-        ACPI_FUNCTION_TRACE("ex_resolve_object_to_value");
+        ACPI_FUNCTION_TRACE(ex_resolve_object_to_value);
        stack_desc = *stack_ptr;
@@ -190,7 +190,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                        }
                        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                          "[Arg/Local %X] value_obj is %p\n",
+                                          "[Arg/Local %X] ValueObj is %p\n",
                                          stack_desc->reference.offset,
                                          obj_desc));
@@ -239,7 +239,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                                /* Invalid reference object */
                                ACPI_ERROR((AE_INFO,
-                                            "Unknown target_type %X in Index/Reference obj %p",
+                                            "Unknown TargetType %X in Index/Reference obj %p",
                                            stack_desc->reference.target_type,
                                            stack_desc));
                                status = AE_AML_INTERNAL;
@@ -293,7 +293,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
        case ACPI_TYPE_LOCAL_INDEX_FIELD:
                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "field_read source_desc=%p Type=%X\n",
+                                  "FieldRead SourceDesc=%p Type=%X\n",
                                  stack_desc,
                                  ACPI_GET_OBJECT_TYPE(stack_desc)));
@@ -337,7 +337,7 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
        acpi_object_type type;
        acpi_status status;
-        ACPI_FUNCTION_TRACE("acpi_ex_resolve_multiple");
+        ACPI_FUNCTION_TRACE(acpi_ex_resolve_multiple);
        /* Operand can be either a namespace node or an operand descriptor */
@@ -488,7 +488,7 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
                case AML_DEBUG_OP:
-                        /* The Debug Object is of type "debug_object" */
+                        /* The Debug Object is of type "DebugObject" */
                        type = ACPI_TYPE_DEBUG_OBJECT;
                        goto exit;
diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c
index 42b9089dcc..4c93d09723 100644
--- a/drivers/acpi/executer/exresop.c
+++ b/drivers/acpi/executer/exresop.c
@@ -144,7 +144,7 @@ acpi_ex_resolve_operands(u16 opcode,
        acpi_object_type type_needed;
        u16 target_op = 0;
-        ACPI_FUNCTION_TRACE_U32("ex_resolve_operands", opcode);
+        ACPI_FUNCTION_TRACE_U32(ex_resolve_operands, opcode);
        op_info = acpi_ps_get_opcode_info(opcode);
        if (op_info->class == AML_CLASS_UNKNOWN) {
@@ -159,7 +159,7 @@ acpi_ex_resolve_operands(u16 opcode,
        }
        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                          "Opcode %X [%s] required_operand_types=%8.8X\n",
+                          "Opcode %X [%s] RequiredOperandTypes=%8.8X\n",
                          opcode, op_info->name, arg_types));
        /*
@@ -249,7 +249,7 @@ acpi_ex_resolve_operands(u16 opcode,
                                        ACPI_DEBUG_ONLY_MEMBERS(ACPI_DEBUG_PRINT
                                                                ((ACPI_DB_EXEC,
-                                                                  "Operand is a Reference, ref_opcode [%s]\n",
+                                                                  "Operand is a Reference, RefOpcode [%s]\n",
                                                                  (acpi_ps_get_opcode_info
                                                                   (obj_desc->
                                                                    reference.
@@ -626,7 +626,7 @@ acpi_ex_resolve_operands(u16 opcode,
                        default:
                                ACPI_ERROR((AE_INFO,
-                                            "Needed [Region/region_field], found [%s] %p",
+                                            "Needed [Region/RegionField], found [%s] %p",
                                            acpi_ut_get_object_type_name
                                            (obj_desc), obj_desc));
diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
index 287476f319..0456405ba0 100644
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/executer/exstore.c
@@ -82,7 +82,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
 {
        u32 i;
-        ACPI_FUNCTION_TRACE_PTR("ex_do_debug_object", source_desc);
+        ACPI_FUNCTION_TRACE_PTR(ex_do_debug_object, source_desc);
        ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "[ACPI Debug] %*s",
                              level, " "));
@@ -245,7 +245,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,
        acpi_status status = AE_OK;
        union acpi_operand_object *ref_desc = dest_desc;
-        ACPI_FUNCTION_TRACE_PTR("ex_store", dest_desc);
+        ACPI_FUNCTION_TRACE_PTR(ex_store, dest_desc);
        /* Validate parameters */
@@ -297,7 +297,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,
                ACPI_DUMP_STACK_ENTRY(source_desc);
                ACPI_DUMP_STACK_ENTRY(dest_desc);
-                ACPI_DUMP_OPERANDS(&dest_desc, ACPI_IMODE_EXECUTE, "ex_store",
+                ACPI_DUMP_OPERANDS(&dest_desc, ACPI_IMODE_EXECUTE, "ExStore",
                                   2,
                                   "Target is not a Reference or Constant object");
@@ -396,7 +396,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
        u8 value = 0;
        u32 i;
-        ACPI_FUNCTION_TRACE("ex_store_object_to_index");
+        ACPI_FUNCTION_TRACE(ex_store_object_to_index);
        /*
         * Destination must be a reference pointer, and
@@ -503,8 +503,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
                break;
        default:
-                ACPI_ERROR((AE_INFO,
+                ACPI_ERROR((AE_INFO, "Target is not a Package or BufferField"));
-                            "Target is not a Package or buffer_field"));
                status = AE_AML_OPERAND_TYPE;
                break;
        }
@@ -549,7 +548,7 @@ acpi_ex_store_object_to_node(union acpi_operand_object *source_desc,
        union acpi_operand_object *new_desc;
        acpi_object_type target_type;
-        ACPI_FUNCTION_TRACE_PTR("ex_store_object_to_node", source_desc);
+        ACPI_FUNCTION_TRACE_PTR(ex_store_object_to_node, source_desc);
        /* Get current type of the node, and object attached to Node */
diff --git a/drivers/acpi/executer/exstoren.c b/drivers/acpi/executer/exstoren.c
index 969f9cbbbe..591aaf0e18 100644
--- a/drivers/acpi/executer/exstoren.c
+++ b/drivers/acpi/executer/exstoren.c
@@ -72,7 +72,7 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
        union acpi_operand_object *source_desc = *source_desc_ptr;
        acpi_status status = AE_OK;
-        ACPI_FUNCTION_TRACE("ex_resolve_object");
+        ACPI_FUNCTION_TRACE(ex_resolve_object);
        /* Ensure we have a Target that can be stored to */
@@ -201,7 +201,7 @@ acpi_ex_store_object_to_object(union acpi_operand_object *source_desc,
        union acpi_operand_object *actual_src_desc;
        acpi_status status = AE_OK;
-        ACPI_FUNCTION_TRACE_PTR("ex_store_object_to_object", source_desc);
+        ACPI_FUNCTION_TRACE_PTR(ex_store_object_to_object, source_desc);
        actual_src_desc = source_desc;
        if (!dest_desc) {
diff --git a/drivers/acpi/executer/exstorob.c b/drivers/acpi/executer/exstorob.c
index db42461101..18925f5b31 100644
--- a/drivers/acpi/executer/exstorob.c
+++ b/drivers/acpi/executer/exstorob.c
@@ -67,7 +67,7 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,
        u32 length;
        u8 *buffer;
-        ACPI_FUNCTION_TRACE_PTR("ex_store_buffer_to_buffer", source_desc);
+        ACPI_FUNCTION_TRACE_PTR(ex_store_buffer_to_buffer, source_desc);
        /* We know that source_desc is a buffer by now */
@@ -158,7 +158,7 @@ acpi_ex_store_string_to_string(union acpi_operand_object *source_desc,
        u32 length;
        u8 *buffer;
-        ACPI_FUNCTION_TRACE_PTR("ex_store_string_to_string", source_desc);
+        ACPI_FUNCTION_TRACE_PTR(ex_store_string_to_string, source_desc);
        /* We know that source_desc is a string by now */
diff --git a/drivers/acpi/executer/exsystem.c b/drivers/acpi/executer/exsystem.c
index 6a2e47a0e1..52beee3674 100644
--- a/drivers/acpi/executer/exsystem.c
+++ b/drivers/acpi/executer/exsystem.c
@@ -68,7 +68,7 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_handle semaphore, u16 timeout)
        acpi_status status;
        acpi_status status2;
-        ACPI_FUNCTION_TRACE("ex_system_wait_semaphore");
+        ACPI_FUNCTION_TRACE(ex_system_wait_semaphore);
        status = acpi_os_wait_semaphore(semaphore, 1, 0);
        if (ACPI_SUCCESS(status)) {
@@ -193,7 +193,7 @@ acpi_ex_system_acquire_mutex(union acpi_operand_object * time_desc,
 {
        acpi_status status = AE_OK;
-        ACPI_FUNCTION_TRACE_PTR("ex_system_acquire_mutex", obj_desc);
+        ACPI_FUNCTION_TRACE_PTR(ex_system_acquire_mutex, obj_desc);
        if (!obj_desc) {
                return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -231,7 +231,7 @@ acpi_status acpi_ex_system_release_mutex(union acpi_operand_object *obj_desc)
 {
        acpi_status status = AE_OK;
-        ACPI_FUNCTION_TRACE("ex_system_release_mutex");
+        ACPI_FUNCTION_TRACE(ex_system_release_mutex);
        if (!obj_desc) {
                return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -265,7 +265,7 @@ acpi_status acpi_ex_system_signal_event(union acpi_operand_object *obj_desc)
 {
        acpi_status status = AE_OK;
-        ACPI_FUNCTION_TRACE("ex_system_signal_event");
+        ACPI_FUNCTION_TRACE(ex_system_signal_event);
        if (obj_desc) {
                status = acpi_os_signal_semaphore(obj_desc->event.semaphore, 1);
@@ -295,7 +295,7 @@ acpi_ex_system_wait_event(union acpi_operand_object *time_desc,
 {
        acpi_status status = AE_OK;
-        ACPI_FUNCTION_TRACE("ex_system_wait_event");
+        ACPI_FUNCTION_TRACE(ex_system_wait_event);
        if (obj_desc) {
                status =
diff --git a/drivers/acpi/executer/exutils.c b/drivers/acpi/executer/exutils.c
index 8543d1a0ed..3ef8cd703e 100644
--- a/drivers/acpi/executer/exutils.c
+++ b/drivers/acpi/executer/exutils.c
@@ -87,7 +87,7 @@ acpi_status acpi_ex_enter_interpreter(void)
 {
        acpi_status status;
-        ACPI_FUNCTION_TRACE("ex_enter_interpreter");
+        ACPI_FUNCTION_TRACE(ex_enter_interpreter);
        status = acpi_ut_acquire_mutex(ACPI_MTX_EXECUTE);
        if (ACPI_FAILURE(status)) {
@@ -123,7 +123,7 @@ void acpi_ex_exit_interpreter(void)
 {
        acpi_status status;
-        ACPI_FUNCTION_TRACE("ex_exit_interpreter");
+        ACPI_FUNCTION_TRACE(ex_exit_interpreter);
        status = acpi_ut_release_mutex(ACPI_MTX_EXECUTE);
        if (ACPI_FAILURE(status)) {
@@ -189,7 +189,7 @@ u8 acpi_ex_acquire_global_lock(u32 field_flags)
        u8 locked = FALSE;
        acpi_status status;
-        ACPI_FUNCTION_TRACE("ex_acquire_global_lock");
+        ACPI_FUNCTION_TRACE(ex_acquire_global_lock);
        /* Only attempt lock if the always_lock bit is set */
@@ -226,7 +226,7 @@ void acpi_ex_release_global_lock(u8 locked_by_me)
 {
        acpi_status status;
-        ACPI_FUNCTION_TRACE("ex_release_global_lock");
+        ACPI_FUNCTION_TRACE(ex_release_global_lock);
        /* Only attempt unlock if the caller locked it */
@@ -266,7 +266,7 @@ static u32 acpi_ex_digits_needed(acpi_integer value, u32 base)
        u32 num_digits;
        acpi_integer current_value;
-        ACPI_FUNCTION_TRACE("ex_digits_needed");
+        ACPI_FUNCTION_TRACE(ex_digits_needed);
        /* acpi_integer is unsigned, so we don't worry about a '-' prefix */