mirror of https://gitee.com/openkylin/linux.git
ACPICA: More Clang changes
ACPICA commit 54b3aefb5de860306951c8c3339b1c37dcdf1b39 V8.0.1: Fixed all "dead assignment" warnings. Link: https://github.com/acpica/acpica/commit/54b3aefb Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Erik Schmauss <erik.schmauss@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
197aba2090
commit
aaf7566f33
|
@ -166,6 +166,9 @@ acpi_status acpi_enter_sleep_state_s4bios(void)
|
||||||
|
|
||||||
status = acpi_hw_write_port(acpi_gbl_FADT.smi_command,
|
status = acpi_hw_write_port(acpi_gbl_FADT.smi_command,
|
||||||
(u32)acpi_gbl_FADT.s4_bios_request, 8);
|
(u32)acpi_gbl_FADT.s4_bios_request, 8);
|
||||||
|
if (ACPI_FAILURE(status)) {
|
||||||
|
return_ACPI_STATUS(status);
|
||||||
|
}
|
||||||
|
|
||||||
do {
|
do {
|
||||||
acpi_os_stall(ACPI_USEC_PER_MSEC);
|
acpi_os_stall(ACPI_USEC_PER_MSEC);
|
||||||
|
|
|
@ -486,5 +486,5 @@ acpi_ns_convert_to_reference(struct acpi_namespace_node *scope,
|
||||||
error_exit:
|
error_exit:
|
||||||
ACPI_FREE(name);
|
ACPI_FREE(name);
|
||||||
*return_object = new_object;
|
*return_object = new_object;
|
||||||
return (AE_OK);
|
return (status);
|
||||||
}
|
}
|
||||||
|
|
|
@ -589,8 +589,6 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
|
||||||
|
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
obj_type = ACPI_TYPE_INVALID; /* Terminate loop after next pass */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
|
|
|
@ -425,8 +425,8 @@ acpi_get_object_info(acpi_handle handle,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cls) {
|
if (cls) {
|
||||||
next_id_string = acpi_ns_copy_device_id(&info->class_code,
|
(void)acpi_ns_copy_device_id(&info->class_code,
|
||||||
cls, next_id_string);
|
cls, next_id_string);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Copy the fixed-length data */
|
/* Copy the fixed-length data */
|
||||||
|
|
|
@ -480,7 +480,7 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state,
|
||||||
acpi_ps_get_opcode_info((*op)->common.aml_opcode);
|
acpi_ps_get_opcode_info((*op)->common.aml_opcode);
|
||||||
walk_state->opcode = (*op)->common.aml_opcode;
|
walk_state->opcode = (*op)->common.aml_opcode;
|
||||||
|
|
||||||
(void)walk_state->ascending_callback(walk_state);
|
status = walk_state->ascending_callback(walk_state);
|
||||||
(void)acpi_ps_next_parse_state(walk_state, *op, status);
|
(void)acpi_ps_next_parse_state(walk_state, *op, status);
|
||||||
|
|
||||||
status2 = acpi_ps_complete_this_op(walk_state, *op);
|
status2 = acpi_ps_complete_this_op(walk_state, *op);
|
||||||
|
@ -489,7 +489,6 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
status = AE_OK;
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case AE_CTRL_BREAK:
|
case AE_CTRL_BREAK:
|
||||||
|
@ -511,14 +510,13 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state,
|
||||||
walk_state->opcode = (*op)->common.aml_opcode;
|
walk_state->opcode = (*op)->common.aml_opcode;
|
||||||
|
|
||||||
status = walk_state->ascending_callback(walk_state);
|
status = walk_state->ascending_callback(walk_state);
|
||||||
status = acpi_ps_next_parse_state(walk_state, *op, status);
|
(void)acpi_ps_next_parse_state(walk_state, *op, status);
|
||||||
|
|
||||||
status2 = acpi_ps_complete_this_op(walk_state, *op);
|
status2 = acpi_ps_complete_this_op(walk_state, *op);
|
||||||
if (ACPI_FAILURE(status2)) {
|
if (ACPI_FAILURE(status2)) {
|
||||||
return_ACPI_STATUS(status2);
|
return_ACPI_STATUS(status2);
|
||||||
}
|
}
|
||||||
|
|
||||||
status = AE_OK;
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case AE_CTRL_TERMINATE:
|
case AE_CTRL_TERMINATE:
|
||||||
|
|
|
@ -312,6 +312,9 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
|
||||||
path_buffer.pointer = user_prt->source;
|
path_buffer.pointer = user_prt->source;
|
||||||
|
|
||||||
status = acpi_ns_handle_to_pathname((acpi_handle)node, &path_buffer, FALSE);
|
status = acpi_ns_handle_to_pathname((acpi_handle)node, &path_buffer, FALSE);
|
||||||
|
if (ACPI_FAILURE(status)) {
|
||||||
|
return_ACPI_STATUS(status);
|
||||||
|
}
|
||||||
|
|
||||||
/* +1 to include null terminator */
|
/* +1 to include null terminator */
|
||||||
|
|
||||||
|
|
|
@ -933,6 +933,9 @@ acpi_tb_load_table(u32 table_index, struct acpi_namespace_node *parent_node)
|
||||||
}
|
}
|
||||||
|
|
||||||
status = acpi_ns_load_table(table_index, parent_node);
|
status = acpi_ns_load_table(table_index, parent_node);
|
||||||
|
if (ACPI_FAILURE(status)) {
|
||||||
|
return_ACPI_STATUS(status);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Update GPEs for any new _Lxx/_Exx methods. Ignore errors. The host is
|
* Update GPEs for any new _Lxx/_Exx methods. Ignore errors. The host is
|
||||||
|
|
|
@ -289,9 +289,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
|
||||||
value);
|
value);
|
||||||
length = ACPI_EISAID_STRING_SIZE;
|
length = ACPI_EISAID_STRING_SIZE;
|
||||||
} else { /* ACPI_TYPE_STRING */
|
} else { /* ACPI_TYPE_STRING */
|
||||||
|
|
||||||
/* Copy the String CID from the returned object */
|
/* Copy the String CID from the returned object */
|
||||||
|
|
||||||
strcpy(next_id_string, cid_objects[i]->string.pointer);
|
strcpy(next_id_string, cid_objects[i]->string.pointer);
|
||||||
length = cid_objects[i]->string.length + 1;
|
length = cid_objects[i]->string.length + 1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue