Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-15 09:34:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Lv Zheng 2015-07-23 12:52:05 +08:00 committed by Rafael J. Wysocki
parent 52721d9d33
commit eb87a05223
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/acpica/nsnames.c
View File

@ -108,7 +108,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,
if (index != 0) { if (index != 0) {
ACPI_ERROR((AE_INFO, ACPI_ERROR((AE_INFO,
"Could not construct external pathname; index=%u, size=%u, Path=%s", "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); return (AE_BAD_PARAMETER);
} }

6
drivers/acpi/acpica/nsparse.c
View File

@ -70,7 +70,7 @@ acpi_ns_one_complete_parse(u32 pass_number,
{ {
union acpi_parse_object *parse_root; union acpi_parse_object *parse_root;
acpi_status status; acpi_status status;
u32 aml_length; u32 aml_length;
u8 *aml_start; u8 *aml_start;
struct acpi_walk_state *walk_state; struct acpi_walk_state *walk_state;
struct acpi_table_header *table; 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)) { if (table->length < sizeof(struct acpi_table_header)) {
status = AE_BAD_HEADER; status = AE_BAD_HEADER;
} else { } 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); aml_length = table->length - sizeof(struct acpi_table_header);
status = acpi_ds_init_aml_walk(walk_state, parse_root, NULL, status = acpi_ds_init_aml_walk(walk_state, parse_root, NULL,
aml_start, aml_length, NULL, aml_start, aml_length, NULL,
(u8) pass_number); (u8)pass_number);
} }
/* Found OSDT table, enable the namespace override feature */ /* Found OSDT table, enable the namespace override feature */

8
drivers/acpi/acpica/psloop.c
View File

@ -126,9 +126,9 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
while (GET_CURRENT_ARG_TYPE(walk_state->arg_types) while (GET_CURRENT_ARG_TYPE(walk_state->arg_types)
&& !walk_state->arg_count) { && !walk_state->arg_count) {
walk_state->aml_offset = walk_state->aml_offset =
(u32) ACPI_PTR_DIFF(walk_state->parser_state.aml, (u32)ACPI_PTR_DIFF(walk_state->parser_state.aml,
walk_state->parser_state. walk_state->parser_state.
aml_start); aml_start);
status = status =
acpi_ps_get_next_arg(walk_state, 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) { if (walk_state->op_info) {
ACPI_DEBUG_PRINT((ACPI_DB_PARSE, ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
"Opcode %4.4X [%s] Op %p Aml %p AmlOffset %5.5X\n", "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, walk_state->op_info->name, op,
parser_state->aml, parser_state->aml,
op->common.aml_offset)); op->common.aml_offset));