ACPICA: Parser: Reduce parser/namespace divergences for tracer support

This patch reduces divergences in parser/namespace components so that the
follow-up linuxized ACPICA upstream commits can be directly merged.
Including the fix to an indent issue reported and fixed by Zhouyi Zhou.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Zhouyi Zhou <yizhouzhou@ict.ac.cn>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/nsnames.c b/drivers/acpi/acpica/nsnames.c
index d293d974803639826fe27a83a7c130ad5c984ed5..2e37888f6abefe7421483e2bc2949560173c7507 100644 (file)
--- a/drivers/acpi/acpica/nsnames.c
+++ b/drivers/acpi/acpica/nsnames.c
@@ -108,7 +108,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,
        if (index != 0) {
                ACPI_ERROR((AE_INFO,
                            "Could not construct external pathname; index=%u, size=%u, Path=%s",
-                           (u32) index, (u32) size, &name_buffer[size]));
+                           (u32)index, (u32)size, &name_buffer[size]));
 
                return (AE_BAD_PARAMETER);
        }

diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c
index 57a4cfe547e4921d09cd41c1a2005cd769b22f83..9926a67ca6d71186de4a0ec9488a1f6b2c04405f 100644 (file)
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -70,7 +70,7 @@ acpi_ns_one_complete_parse(u32 pass_number,
 {
        union acpi_parse_object *parse_root;
        acpi_status status;
-       u32 aml_length;
+       u32 aml_length;
        u8 *aml_start;
        struct acpi_walk_state *walk_state;
        struct acpi_table_header *table;
@@ -110,11 +110,11 @@ acpi_ns_one_complete_parse(u32 pass_number,
        if (table->length < sizeof(struct acpi_table_header)) {
                status = AE_BAD_HEADER;
        } else {
-               aml_start = (u8 *) table + sizeof(struct acpi_table_header);
+               aml_start = (u8 *)table + sizeof(struct acpi_table_header);
                aml_length = table->length - sizeof(struct acpi_table_header);
                status = acpi_ds_init_aml_walk(walk_state, parse_root, NULL,
                                               aml_start, aml_length, NULL,
-                                              (u8) pass_number);
+                                              (u8)pass_number);
        }
 
        /* Found OSDT table, enable the namespace override feature */

diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c
index 90437227d79095fdaec394eb101c90d73543f961..6136458d65d23bc4b204b44c080cb01535cfc7bc 100644 (file)
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -126,9 +126,9 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
                while (GET_CURRENT_ARG_TYPE(walk_state->arg_types)
                       && !walk_state->arg_count) {
                        walk_state->aml_offset =
-                           (u32) ACPI_PTR_DIFF(walk_state->parser_state.aml,
-                                               walk_state->parser_state.
-                                               aml_start);
+                           (u32)ACPI_PTR_DIFF(walk_state->parser_state.aml,
+                                              walk_state->parser_state.
+                                              aml_start);
 
                        status =
                            acpi_ps_get_next_arg(walk_state,
@@ -499,7 +499,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                        if (walk_state->op_info) {
                                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
                                                  "Opcode %4.4X [%s] Op %p Aml %p AmlOffset %5.5X\n",
-                                                 (u32) op->common.aml_opcode,
+                                                 (u32)op->common.aml_opcode,
                                                  walk_state->op_info->name, op,
                                                  parser_state->aml,
                                                  op->common.aml_offset));