openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ACPICA: acpidump: Removed dead code from oslinuxtbl.c 

ACPICA commit 4d938d048790983b8b4252b0f4aeec59dabb476c

ACPICA BZ 1119.

Link: https://github.com/acpica/acpica/commit/4d938d04
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Bob Moore 2020-06-04 13:44:19 -07:00 committed by Rafael J. Wysocki
parent 2d2feb6813
commit d82faa0825
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
View File

@ -35,7 +35,7 @@ static acpi_status osl_add_table_to_list(char *signature, u32 instance);
static acpi_status static acpi_status
osl_read_table_from_file(char *filename, osl_read_table_from_file(char *filename,
acpi_size file_offset, acpi_size file_offset,
char *signature, struct acpi_table_header **table); struct acpi_table_header **table);
static acpi_status static acpi_status
osl_map_table(acpi_size address, 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 * PARAMETERS: filename - File that contains the desired table
* file_offset - Offset of the table in file * 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 * table - Where a pointer to the table is returned
* *
* RETURN: Status; Table buffer is returned if AE_OK. * 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 static acpi_status
osl_read_table_from_file(char *filename, osl_read_table_from_file(char *filename,
acpi_size file_offset, acpi_size file_offset,
char *signature, struct acpi_table_header **table) struct acpi_table_header **table)
{ {
FILE *table_file; FILE *table_file;
struct acpi_table_header header; struct acpi_table_header header;
@ -1225,6 +1223,8 @@ osl_read_table_from_file(char *filename,
goto exit; goto exit;
} }
#ifdef ACPI_OBSOLETE_FUNCTIONS
/* If signature is specified, it must match the table */ /* If signature is specified, it must match the table */
if (signature) { if (signature) {
@ -1244,6 +1244,7 @@ osl_read_table_from_file(char *filename,
goto exit; goto exit;
} }
} }
#endif
table_length = ap_get_table_length(&header); table_length = ap_get_table_length(&header);
if (table_length == 0) { 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 */ /* There is no physical address saved for customized tables, use zero */
*address = 0; *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); return (status);
} }