Commit 80b28810 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Linuxize: reduce divergences for 20160212 release 



The patch reduces source code differences between the Linux kernel and the
ACPICA upstream so that the linuxized ACPICA 20160212 release can be
applied with reduced human intervention.

Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
[ rjw: White space damage fixes ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 9735a227

drivers/acpi/acpica/nsinit.c

+0 −1
Original line number Diff line number Diff line
@@ -602,7 +602,6 @@ acpi_ns_init_one_device(acpi_handle obj_handle, 
	info->flags = ACPI_IGNORE_RETURN_VALUE;



	status = acpi_ns_evaluate(info);



	if (ACPI_SUCCESS(status)) {

		walk_info->num_INI++;

	}

drivers/acpi/acpica/nsload.c

+1 −1
Original line number Diff line number Diff line
@@ -123,8 +123,8 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node) 
		(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);

		acpi_ns_delete_namespace_by_owner(acpi_gbl_root_table_list.

						  tables[table_index].owner_id);

		acpi_tb_release_owner_id(table_index);



		acpi_tb_release_owner_id(table_index);

		return_ACPI_STATUS(status);

	}

drivers/acpi/osl.c

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ static char acpi_os_name[ACPI_MAX_OVERRIDE_LEN]; 


acpi_status

acpi_os_predefined_override(const struct acpi_predefined_names *init_val,

			    char **new_val)

			    acpi_string *new_val)

{

	if (!init_val || !new_val)

		return AE_BAD_PARAMETER;

include/acpi/acpiosxf.h

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ acpi_physical_address acpi_os_get_root_pointer(void); 
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_predefined_override

acpi_status

acpi_os_predefined_override(const struct acpi_predefined_names *init_val,

			    char **new_val);

			    acpi_string *new_val);

#endif



#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_table_override