diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-03-30 14:53:36 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-03-30 14:53:36 +0200 |
commit | 6d582d7e31b67f84e544ba466edfac4d042e2d78 (patch) | |
tree | 9c00f4f28e1737786db39b679d476d50f7758c71 /drivers/acpi/acpica/tbxface.c | |
parent | acpi/x86: ignore unspecified bit positions in the ACPI global lock field (diff) | |
parent | ACPICA: Update version to 20200214 (diff) | |
download | linux-6d582d7e31b67f84e544ba466edfac4d042e2d78.tar.gz linux-6d582d7e31b67f84e544ba466edfac4d042e2d78.tar.bz2 linux-6d582d7e31b67f84e544ba466edfac4d042e2d78.zip |
Merge branch 'acpica'
* acpica:
ACPICA: Update version to 20200214
ACPICA: Fix a couple of typos
ACPICA: use acpi_size instead of u32 for prefix_path_length
ACPICA: cast length arguement to acpi_ns_build_normalized_path() as u32
ACPICA: cast the result of the pointer difference to u32
ACPICA: Table Manager: Update comments in a function header
ACPICA: Enable sleep button on ACPI legacy wake
ACPICA: Fix a comment "enable" fixed events -> "disable" all fixed events.
ACPICA: ASL-ASL+ converter: make root file a parameter for cv_init_file_tree
ACPICA: ASL-ASL+ converter: remove function parameters from cv_init_file_tree()
Diffstat (limited to 'drivers/acpi/acpica/tbxface.c')
-rw-r--r-- | drivers/acpi/acpica/tbxface.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c index f8403d480318..7490429ddbf6 100644 --- a/drivers/acpi/acpica/tbxface.c +++ b/drivers/acpi/acpica/tbxface.c @@ -202,14 +202,14 @@ ACPI_EXPORT_SYMBOL_INIT(acpi_reallocate_root_table) * * PARAMETERS: signature - ACPI signature of needed table * instance - Which instance (for SSDTs) - * out_table_header - The pointer to the table header to fill + * out_table_header - The pointer to the where the table header + * is returned * - * RETURN: Status and pointer to mapped table header + * RETURN: Status and a copy of the table header * - * DESCRIPTION: Finds an ACPI table header. - * - * NOTE: Caller is responsible in unmapping the header with - * acpi_os_unmap_memory + * DESCRIPTION: Finds and returns an ACPI table header. Caller provides the + * memory where a copy of the header is to be returned + * (fixed length). * ******************************************************************************/ acpi_status |