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>
if (index != 0) {
ACPI_ERROR((AE_INFO,
"Could not construct external pathname; index=%u, size=%u, Path=%s",
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);
}
return (AE_BAD_PARAMETER);
}
{
union acpi_parse_object *parse_root;
acpi_status status;
{
union acpi_parse_object *parse_root;
acpi_status status;
u8 *aml_start;
struct acpi_walk_state *walk_state;
struct acpi_table_header *table;
u8 *aml_start;
struct acpi_walk_state *walk_state;
struct acpi_table_header *table;
if (table->length < sizeof(struct acpi_table_header)) {
status = AE_BAD_HEADER;
} else {
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,
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,
}
/* Found OSDT table, enable the namespace override feature */
}
/* Found OSDT table, enable the namespace override feature */
while (GET_CURRENT_ARG_TYPE(walk_state->arg_types)
&& !walk_state->arg_count) {
walk_state->aml_offset =
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,
status =
acpi_ps_get_next_arg(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",
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));
walk_state->op_info->name, op,
parser_state->aml,
op->common.aml_offset));