Skip to content

Commit d82faa0

Browse files
acpibobrafaeljw
authored andcommitted
ACPICA: acpidump: Removed dead code from oslinuxtbl.c
ACPICA commit 4d938d048790983b8b4252b0f4aeec59dabb476c ACPICA BZ 1119. Link: acpica/acpica@4d938d04 Signed-off-by: Bob Moore <[email protected]> Signed-off-by: Erik Kaneda <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 2d2feb6 commit d82faa0

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

tools/power/acpi/os_specific/service_layers/oslinuxtbl.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static acpi_status osl_add_table_to_list(char *signature, u32 instance);
3535
static acpi_status
3636
osl_read_table_from_file(char *filename,
3737
acpi_size file_offset,
38-
char *signature, struct acpi_table_header **table);
38+
struct acpi_table_header **table);
3939

4040
static acpi_status
4141
osl_map_table(acpi_size address,
@@ -1184,8 +1184,6 @@ osl_table_name_from_file(char *filename, char *signature, u32 *instance)
11841184
*
11851185
* PARAMETERS: filename - File that contains the desired table
11861186
* file_offset - Offset of the table in file
1187-
* signature - Optional ACPI Signature for desired table.
1188-
* A null terminated 4-character string.
11891187
* table - Where a pointer to the table is returned
11901188
*
11911189
* RETURN: Status; Table buffer is returned if AE_OK.
@@ -1197,7 +1195,7 @@ osl_table_name_from_file(char *filename, char *signature, u32 *instance)
11971195
static acpi_status
11981196
osl_read_table_from_file(char *filename,
11991197
acpi_size file_offset,
1200-
char *signature, struct acpi_table_header **table)
1198+
struct acpi_table_header **table)
12011199
{
12021200
FILE *table_file;
12031201
struct acpi_table_header header;
@@ -1225,6 +1223,8 @@ osl_read_table_from_file(char *filename,
12251223
goto exit;
12261224
}
12271225

1226+
#ifdef ACPI_OBSOLETE_FUNCTIONS
1227+
12281228
/* If signature is specified, it must match the table */
12291229

12301230
if (signature) {
@@ -1244,6 +1244,7 @@ osl_read_table_from_file(char *filename,
12441244
goto exit;
12451245
}
12461246
}
1247+
#endif
12471248

12481249
table_length = ap_get_table_length(&header);
12491250
if (table_length == 0) {
@@ -1366,7 +1367,7 @@ osl_get_customized_table(char *pathname,
13661367
/* There is no physical address saved for customized tables, use zero */
13671368

13681369
*address = 0;
1369-
status = osl_read_table_from_file(table_filename, 0, NULL, table);
1370+
status = osl_read_table_from_file(table_filename, 0, table);
13701371

13711372
return (status);
13721373
}

0 commit comments

Comments
 (0)