diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-06-10 17:27:28 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-06-10 17:27:28 +0200 |
| commit | ede439be684c54f01147e1f65cc565c6baaca1a4 (patch) | |
| tree | 5c7275a678f53e1f0d4ddc2fd41f6326477adbf7 /tools | |
| parent | 118d6e98293b30aee378a6b08d27a35320a3e34f (diff) | |
| parent | 34a09bffd9982fdced603643068c39de867ec778 (diff) | |
| download | linux-ede439be684c54f01147e1f65cc565c6baaca1a4.tar.gz | |
Merge branch 'acpica'
* acpica: ACPICA: Update version to 20200528 ACPICA: iASL: add new OperationRegion subtype keyword PlatformRtMechanism ACPICA: acpidump: Removed dead code from oslinuxtbl.c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/power/acpi/os_specific/service_layers/oslinuxtbl.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c b/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c index 5aaddc79adf7..dd38c2b2e1b4 100644 --- a/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c +++ b/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c @@ -35,7 +35,7 @@ static acpi_status osl_add_table_to_list(char *signature, u32 instance); static acpi_status osl_read_table_from_file(char *filename, acpi_size file_offset, - char *signature, struct acpi_table_header **table); + struct acpi_table_header **table); static acpi_status osl_map_table(acpi_size address, @@ -1184,8 +1184,6 @@ osl_table_name_from_file(char *filename, char *signature, u32 *instance) * * PARAMETERS: filename - File that contains the desired table * file_offset - Offset of the table in file - * signature - Optional ACPI Signature for desired table. - * A null terminated 4-character string. * table - Where a pointer to the table is returned * * RETURN: Status; Table buffer is returned if AE_OK. @@ -1197,7 +1195,7 @@ osl_table_name_from_file(char *filename, char *signature, u32 *instance) static acpi_status osl_read_table_from_file(char *filename, acpi_size file_offset, - char *signature, struct acpi_table_header **table) + struct acpi_table_header **table) { FILE *table_file; struct acpi_table_header header; @@ -1225,6 +1223,8 @@ osl_read_table_from_file(char *filename, goto exit; } +#ifdef ACPI_OBSOLETE_FUNCTIONS + /* If signature is specified, it must match the table */ if (signature) { @@ -1244,6 +1244,7 @@ osl_read_table_from_file(char *filename, goto exit; } } +#endif table_length = ap_get_table_length(&header); if (table_length == 0) { @@ -1366,7 +1367,7 @@ osl_get_customized_table(char *pathname, /* There is no physical address saved for customized tables, use zero */ *address = 0; - status = osl_read_table_from_file(table_filename, 0, NULL, table); + status = osl_read_table_from_file(table_filename, 0, table); return (status); } |