summaryrefslogtreecommitdiffstats
path: root/include/acpi/acpixf.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-04 16:05:20 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-04 16:05:20 -0500
commite3e9b577b477edbf50e6c1f93beee89f450f2b68 (patch)
treefba9c882c67cb4212a1a041011c22a1703ff9d5b /include/acpi/acpixf.h
parent6b0e2b32871b7c10c75d647b0295a092f918f3e7 (diff)
ACPICA: Drop Linux-specific waking vector functions
Commit f06147f9fbf1 (ACPICA: Hardware: Enable firmware waking vector for both 32-bit and 64-bit FACS) added three functions that aren't present in upstream ACPICA, acpi_hw_set_firmware_waking_vectors(), acpi_set_firmware_waking_vectors() and acpi_set_firmware_waking_vector64(), to allow Linux to use the previously existing API for setting the platform firmware waking vector. However, that wasn't necessary, since the ACPI sleep support code in Linux can be modified to use the upstream ACPICA's API easily and the additional functions may be dropped which reduces the code size and puts the kernel's ACPICA code more in line with the upstream. Make the changes as per the above. While at it, make the relevant function desctiption comments reflect the upstream ACPICA's ones. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Lv Zheng <lv.zheng@intel.com>
Diffstat (limited to 'include/acpi/acpixf.h')
-rw-r--r--include/acpi/acpixf.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 1b462d800d27..012b2eed7a93 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -863,17 +863,9 @@ ACPI_EXTERNAL_RETURN_STATUS(acpi_status
863ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_leave_sleep_state(u8 sleep_state)) 863ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_leave_sleep_state(u8 sleep_state))
864 864
865ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 865ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
866 acpi_set_firmware_waking_vectors 866 acpi_set_firmware_waking_vector
867 (acpi_physical_address physical_address, 867 (acpi_physical_address physical_address,
868 acpi_physical_address physical_address64)) 868 acpi_physical_address physical_address64))
869ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
870 acpi_set_firmware_waking_vector(u32
871 physical_address))
872#if ACPI_MACHINE_WIDTH == 64
873ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
874 acpi_set_firmware_waking_vector64(u64
875 physical_address))
876#endif
877/* 869/*
878 * ACPI Timer interfaces 870 * ACPI Timer interfaces
879 */ 871 */