ACPICA: Cosmetic changes only, no functional changes
Lint changes, fix compiler warnings, etc. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
39adb11e56
commit
1d18c05825
|
@ -349,9 +349,10 @@ acpi_status acpi_ev_init_global_lock_handler(void)
|
||||||
|
|
||||||
ACPI_FUNCTION_TRACE(ev_init_global_lock_handler);
|
ACPI_FUNCTION_TRACE(ev_init_global_lock_handler);
|
||||||
|
|
||||||
status =
|
status = acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
|
||||||
acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
|
ACPI_CAST_INDIRECT_PTR(struct
|
||||||
(struct acpi_table_header **)&facs);
|
acpi_table_header,
|
||||||
|
&facs));
|
||||||
if (ACPI_FAILURE(status)) {
|
if (ACPI_FAILURE(status)) {
|
||||||
return_ACPI_STATUS(status);
|
return_ACPI_STATUS(status);
|
||||||
}
|
}
|
||||||
|
|
|
@ -394,7 +394,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
|
||||||
ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,
|
ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,
|
||||||
"Handler %p (@%p) Address %8.8X%8.8X [%s]\n",
|
"Handler %p (@%p) Address %8.8X%8.8X [%s]\n",
|
||||||
®ion_obj->region.handler->address_space, handler,
|
®ion_obj->region.handler->address_space, handler,
|
||||||
ACPI_FORMAT_UINT64(address),
|
ACPI_FORMAT_NATIVE_UINT(address),
|
||||||
acpi_ut_get_region_name(region_obj->region.
|
acpi_ut_get_region_name(region_obj->region.
|
||||||
space_id)));
|
space_id)));
|
||||||
|
|
||||||
|
|
|
@ -70,9 +70,10 @@ acpi_set_firmware_waking_vector(acpi_physical_address physical_address)
|
||||||
|
|
||||||
/* Get the FACS */
|
/* Get the FACS */
|
||||||
|
|
||||||
status =
|
status = acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
|
||||||
acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
|
ACPI_CAST_INDIRECT_PTR(struct
|
||||||
(struct acpi_table_header **)&facs);
|
acpi_table_header,
|
||||||
|
&facs));
|
||||||
if (ACPI_FAILURE(status)) {
|
if (ACPI_FAILURE(status)) {
|
||||||
return_ACPI_STATUS(status);
|
return_ACPI_STATUS(status);
|
||||||
}
|
}
|
||||||
|
@ -124,9 +125,10 @@ acpi_get_firmware_waking_vector(acpi_physical_address * physical_address)
|
||||||
|
|
||||||
/* Get the FACS */
|
/* Get the FACS */
|
||||||
|
|
||||||
status =
|
status = acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
|
||||||
acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
|
ACPI_CAST_INDIRECT_PTR(struct
|
||||||
(struct acpi_table_header **)&facs);
|
acpi_table_header,
|
||||||
|
&facs));
|
||||||
if (ACPI_FAILURE(status)) {
|
if (ACPI_FAILURE(status)) {
|
||||||
return_ACPI_STATUS(status);
|
return_ACPI_STATUS(status);
|
||||||
}
|
}
|
||||||
|
|
|
@ -249,7 +249,9 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
|
||||||
acpi_os_printf("ID %X Len %.4X Addr %p\n",
|
acpi_os_printf("ID %X Len %.4X Addr %p\n",
|
||||||
obj_desc->processor.proc_id,
|
obj_desc->processor.proc_id,
|
||||||
obj_desc->processor.length,
|
obj_desc->processor.length,
|
||||||
(char *)obj_desc->processor.address);
|
ACPI_CAST_PTR(void,
|
||||||
|
obj_desc->processor.
|
||||||
|
address));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ACPI_TYPE_DEVICE:
|
case ACPI_TYPE_DEVICE:
|
||||||
|
@ -320,9 +322,8 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
|
||||||
space_id));
|
space_id));
|
||||||
if (obj_desc->region.flags & AOPOBJ_DATA_VALID) {
|
if (obj_desc->region.flags & AOPOBJ_DATA_VALID) {
|
||||||
acpi_os_printf(" Addr %8.8X%8.8X Len %.4X\n",
|
acpi_os_printf(" Addr %8.8X%8.8X Len %.4X\n",
|
||||||
ACPI_FORMAT_UINT64(obj_desc->
|
ACPI_FORMAT_NATIVE_UINT
|
||||||
region.
|
(obj_desc->region.address),
|
||||||
address),
|
|
||||||
obj_desc->region.length);
|
obj_desc->region.length);
|
||||||
} else {
|
} else {
|
||||||
acpi_os_printf
|
acpi_os_printf
|
||||||
|
|
|
@ -111,7 +111,7 @@ acpi_ns_load_table(acpi_native_uint table_index,
|
||||||
if (ACPI_SUCCESS(status)) {
|
if (ACPI_SUCCESS(status)) {
|
||||||
acpi_tb_set_table_loaded_flag(table_index, TRUE);
|
acpi_tb_set_table_loaded_flag(table_index, TRUE);
|
||||||
} else {
|
} else {
|
||||||
acpi_tb_release_owner_id(table_index);
|
(void)acpi_tb_release_owner_id(table_index);
|
||||||
}
|
}
|
||||||
|
|
||||||
unlock:
|
unlock:
|
||||||
|
|
|
@ -182,7 +182,7 @@ acpi_size acpi_ns_get_pathname_length(struct acpi_namespace_node *node)
|
||||||
while (next_node && (next_node != acpi_gbl_root_node)) {
|
while (next_node && (next_node != acpi_gbl_root_node)) {
|
||||||
if (ACPI_GET_DESCRIPTOR_TYPE(next_node) != ACPI_DESC_TYPE_NAMED) {
|
if (ACPI_GET_DESCRIPTOR_TYPE(next_node) != ACPI_DESC_TYPE_NAMED) {
|
||||||
ACPI_ERROR((AE_INFO,
|
ACPI_ERROR((AE_INFO,
|
||||||
"Invalid NS Node (%X) while traversing path",
|
"Invalid NS Node (%p) while traversing path",
|
||||||
next_node));
|
next_node));
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -112,21 +112,25 @@ acpi_ns_one_complete_parse(acpi_native_uint pass_number,
|
||||||
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, (u32) aml_length,
|
||||||
(u8) pass_number);
|
NULL, (u8) pass_number);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ACPI_FAILURE(status)) {
|
if (ACPI_FAILURE(status)) {
|
||||||
acpi_ds_delete_walk_state(walk_state);
|
acpi_ds_delete_walk_state(walk_state);
|
||||||
acpi_ps_delete_parse_tree(parse_root);
|
goto cleanup;
|
||||||
return_ACPI_STATUS(status);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* start_node is the default location to load the table */
|
/* start_node is the default location to load the table */
|
||||||
|
|
||||||
if (start_node && start_node != acpi_gbl_root_node) {
|
if (start_node && start_node != acpi_gbl_root_node) {
|
||||||
|
status =
|
||||||
acpi_ds_scope_stack_push(start_node, ACPI_TYPE_METHOD,
|
acpi_ds_scope_stack_push(start_node, ACPI_TYPE_METHOD,
|
||||||
walk_state);
|
walk_state);
|
||||||
|
if (ACPI_FAILURE(status)) {
|
||||||
|
acpi_ds_delete_walk_state(walk_state);
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Parse the AML */
|
/* Parse the AML */
|
||||||
|
@ -135,6 +139,7 @@ acpi_ns_one_complete_parse(acpi_native_uint pass_number,
|
||||||
(unsigned)pass_number));
|
(unsigned)pass_number));
|
||||||
status = acpi_ps_parse_aml(walk_state);
|
status = acpi_ps_parse_aml(walk_state);
|
||||||
|
|
||||||
|
cleanup:
|
||||||
acpi_ps_delete_parse_tree(parse_root);
|
acpi_ps_delete_parse_tree(parse_root);
|
||||||
return_ACPI_STATUS(status);
|
return_ACPI_STATUS(status);
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,7 +73,7 @@ acpi_rs_stream_option_length(u32 resource_length, u32 minimum_total_length);
|
||||||
|
|
||||||
static u8 acpi_rs_count_set_bits(u16 bit_field)
|
static u8 acpi_rs_count_set_bits(u16 bit_field)
|
||||||
{
|
{
|
||||||
u8 bits_set;
|
acpi_native_uint bits_set;
|
||||||
|
|
||||||
ACPI_FUNCTION_ENTRY();
|
ACPI_FUNCTION_ENTRY();
|
||||||
|
|
||||||
|
@ -81,10 +81,10 @@ static u8 acpi_rs_count_set_bits(u16 bit_field)
|
||||||
|
|
||||||
/* Zero the least significant bit that is set */
|
/* Zero the least significant bit that is set */
|
||||||
|
|
||||||
bit_field &= (bit_field - 1);
|
bit_field &= (u16) (bit_field - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (bits_set);
|
return ((u8) bits_set);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
|
|
|
@ -97,17 +97,17 @@ u8 acpi_rs_decode_bitmask(u16 mask, u8 * list)
|
||||||
u16 acpi_rs_encode_bitmask(u8 * list, u8 count)
|
u16 acpi_rs_encode_bitmask(u8 * list, u8 count)
|
||||||
{
|
{
|
||||||
acpi_native_uint i;
|
acpi_native_uint i;
|
||||||
u16 mask;
|
acpi_native_uint mask;
|
||||||
|
|
||||||
ACPI_FUNCTION_ENTRY();
|
ACPI_FUNCTION_ENTRY();
|
||||||
|
|
||||||
/* Encode the list into a single bitmask */
|
/* Encode the list into a single bitmask */
|
||||||
|
|
||||||
for (i = 0, mask = 0; i < count; i++) {
|
for (i = 0, mask = 0; i < count; i++) {
|
||||||
mask |= (0x0001 << list[i]);
|
mask |= (0x1 << list[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (mask);
|
return ((u16) mask);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
|
|
|
@ -147,7 +147,7 @@ acpi_status acpi_ut_delete_caches(void)
|
||||||
|
|
||||||
if (acpi_gbl_display_final_mem_stats) {
|
if (acpi_gbl_display_final_mem_stats) {
|
||||||
ACPI_STRCPY(buffer, "MEMORY");
|
ACPI_STRCPY(buffer, "MEMORY");
|
||||||
acpi_db_display_statistics(buffer);
|
(void)acpi_db_display_statistics(buffer);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -570,7 +570,7 @@ acpi_ut_copy_epackage_to_ipackage(union acpi_object *external_object,
|
||||||
|
|
||||||
/* Truncate package and delete it */
|
/* Truncate package and delete it */
|
||||||
|
|
||||||
package_object->package.count = i;
|
package_object->package.count = (u32) i;
|
||||||
package_elements[i] = NULL;
|
package_elements[i] = NULL;
|
||||||
acpi_ut_remove_reference(package_object);
|
acpi_ut_remove_reference(package_object);
|
||||||
return_ACPI_STATUS(status);
|
return_ACPI_STATUS(status);
|
||||||
|
|
|
@ -68,9 +68,9 @@ static const char *acpi_ut_trim_function_name(const char *function_name);
|
||||||
|
|
||||||
void acpi_ut_init_stack_ptr_trace(void)
|
void acpi_ut_init_stack_ptr_trace(void)
|
||||||
{
|
{
|
||||||
u32 current_sp;
|
acpi_size current_sp;
|
||||||
|
|
||||||
acpi_gbl_entry_stack_pointer = ACPI_PTR_DIFF(¤t_sp, NULL);
|
acpi_gbl_entry_stack_pointer = ¤t_sp;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
|
@ -89,10 +89,8 @@ void acpi_ut_track_stack_ptr(void)
|
||||||
{
|
{
|
||||||
acpi_size current_sp;
|
acpi_size current_sp;
|
||||||
|
|
||||||
current_sp = ACPI_PTR_DIFF(¤t_sp, NULL);
|
if (¤t_sp < acpi_gbl_lowest_stack_pointer) {
|
||||||
|
acpi_gbl_lowest_stack_pointer = ¤t_sp;
|
||||||
if (current_sp < acpi_gbl_lowest_stack_pointer) {
|
|
||||||
acpi_gbl_lowest_stack_pointer = current_sp;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (acpi_gbl_nesting_level > acpi_gbl_deepest_nesting) {
|
if (acpi_gbl_nesting_level > acpi_gbl_deepest_nesting) {
|
||||||
|
|
|
@ -723,7 +723,7 @@ void acpi_ut_init_globals(void)
|
||||||
acpi_gbl_root_node_struct.flags = ANOBJ_END_OF_PEER_LIST;
|
acpi_gbl_root_node_struct.flags = ANOBJ_END_OF_PEER_LIST;
|
||||||
|
|
||||||
#ifdef ACPI_DEBUG_OUTPUT
|
#ifdef ACPI_DEBUG_OUTPUT
|
||||||
acpi_gbl_lowest_stack_pointer = ACPI_SIZE_MAX;
|
acpi_gbl_lowest_stack_pointer = ACPI_CAST_PTR(acpi_size, ACPI_SIZE_MAX);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef ACPI_DBG_TRACK_ALLOCATIONS
|
#ifdef ACPI_DBG_TRACK_ALLOCATIONS
|
||||||
|
|
Loading…
Reference in a new issue