diff options
| author |   Lv Zheng <lv.zheng@intel.com> | 2016-03-24 09:38:28 +0800 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-04 17:16:07 +0200 |
| commit | 80b28810cc98aadc80e7ce8cc155a774a7ada8ca (patch) | |
| tree | 28b00fe7ae9865d750d36a27501d4bbec7d76c06 /drivers/acpi | |
| parent | Linux 4.6-rc2 (diff) | |
| download | linux-dev-80b28810cc98aadc80e7ce8cc155a774a7ada8ca.tar.xz linux-dev-80b28810cc98aadc80e7ce8cc155a774a7ada8ca.zip | |
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: Lv Zheng <lv.zheng@intel.com>
[ rjw: White space damage fixes ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/acpica/nsinit.c | 1 | ||||
| -rw-r--r-- | drivers/acpi/acpica/nsload.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/osl.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c index d4aa8b696ee9..2de8adb41d64 100644 --- a/drivers/acpi/acpica/nsinit.c +++ b/drivers/acpi/acpica/nsinit.c @@ -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++; } diff --git a/drivers/acpi/acpica/nsload.c b/drivers/acpi/acpica/nsload.c index 75cdb8790d49..b5e2b0ada0ab 100644 --- a/drivers/acpi/acpica/nsload.c +++ b/drivers/acpi/acpica/nsload.c @@ -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); } diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 814d5f83b75e..bef06c9503cd 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -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; |