Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97cbb7d1 authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Remove extraneous parameter in table manager 



Removed the Flags parameter from several internal functions since
it was not being used.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent ac5f98db

drivers/acpi/acpica/actables.h

+3 −4
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ acpi_status acpi_allocate_root_table(u32 initial_table_count); 
/*

 * tbfadt - FADT parse/convert/validate

 */

void acpi_tb_parse_fadt(u32 table_index, u8 flags);

void acpi_tb_parse_fadt(u32 table_index);



void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length);
@@ -109,9 +109,8 @@ acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length); 


void

acpi_tb_install_table(acpi_physical_address address,

		      u8 flags, char *signature, u32 table_index);

		      char *signature, u32 table_index);



acpi_status

acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags);

acpi_status acpi_tb_parse_root_table(acpi_physical_address rsdp_address);



#endif				/* __ACTABLES_H__ */

drivers/acpi/acpica/tbfadt.c

+3 −4
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ acpi_tb_init_generic_address(struct acpi_generic_address *generic_address, 
 * FUNCTION:    acpi_tb_parse_fadt

 *

 * PARAMETERS:  table_index         - Index for the FADT

 *              Flags               - Flags

 *

 * RETURN:      None

 *
@@ -181,7 +180,7 @@ acpi_tb_init_generic_address(struct acpi_generic_address *generic_address, 
 *

 ******************************************************************************/



void acpi_tb_parse_fadt(u32 table_index, u8 flags)

void acpi_tb_parse_fadt(u32 table_index)

{

	u32 length;

	struct acpi_table_header *table;
@@ -219,10 +218,10 @@ void acpi_tb_parse_fadt(u32 table_index, u8 flags) 
	/* Obtain the DSDT and FACS tables via their addresses within the FADT */



	acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.Xdsdt,

			      flags, ACPI_SIG_DSDT, ACPI_TABLE_INDEX_DSDT);

			      ACPI_SIG_DSDT, ACPI_TABLE_INDEX_DSDT);



	acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.Xfacs,

			      flags, ACPI_SIG_FACS, ACPI_TABLE_INDEX_FACS);

			      ACPI_SIG_FACS, ACPI_TABLE_INDEX_FACS);

}



/*******************************************************************************

drivers/acpi/acpica/tbutils.c

+7 −7
Original line number Diff line number Diff line
@@ -280,7 +280,6 @@ u8 acpi_tb_checksum(u8 *buffer, u32 length) 
 * FUNCTION:    acpi_tb_install_table

 *

 * PARAMETERS:  Address                 - Physical address of DSDT or FACS

 *              Flags                   - Flags

 *              Signature               - Table signature, NULL if no need to

 *                                        match

 *              table_index             - Index into root table array
@@ -296,8 +295,9 @@ u8 acpi_tb_checksum(u8 *buffer, u32 length) 


void

acpi_tb_install_table(acpi_physical_address address,

		      u8 flags, char *signature, u32 table_index)

		      char *signature, u32 table_index)

{

	u8 flags;

	acpi_status status;

	struct acpi_table_header *table_to_install;

	struct acpi_table_header *mapped_table;
@@ -344,12 +344,13 @@ acpi_tb_install_table(acpi_physical_address address, 


		acpi_gbl_root_table_list.tables[table_index].pointer =

		    override_table;

		flags = ACPI_TABLE_ORIGIN_OVERRIDE;

		address = ACPI_PTR_TO_PHYSADDR(override_table);



		table_to_install = override_table;

		flags = ACPI_TABLE_ORIGIN_OVERRIDE;

	} else {

		table_to_install = mapped_table;

		flags = ACPI_TABLE_ORIGIN_MAPPED;

	}



	/* Initialize the table entry */
@@ -435,7 +436,6 @@ acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size) 
 * FUNCTION:    acpi_tb_parse_root_table

 *

 * PARAMETERS:  Rsdp                    - Pointer to the RSDP

 *              Flags                   - Flags

 *

 * RETURN:      Status

 *
@@ -449,7 +449,7 @@ acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size) 
 ******************************************************************************/



acpi_status __init

acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)

acpi_tb_parse_root_table(acpi_physical_address rsdp_address)

{

	struct acpi_table_rsdp *rsdp;

	u32 table_entry_size;
@@ -600,14 +600,14 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags) 
	 */

	for (i = 2; i < acpi_gbl_root_table_list.count; i++) {

		acpi_tb_install_table(acpi_gbl_root_table_list.tables[i].

				      address, flags, NULL, i);

				      address, NULL, i);



		/* Special case for FADT - get the DSDT and FACS */



		if (ACPI_COMPARE_NAME

		    (&acpi_gbl_root_table_list.tables[i].signature,

		     ACPI_SIG_FADT)) {

			acpi_tb_parse_fadt(i, flags);

			acpi_tb_parse_fadt(i);

		}

	}

drivers/acpi/acpica/tbxface.c

+1 −2
Original line number Diff line number Diff line
@@ -150,8 +150,7 @@ acpi_initialize_tables(struct acpi_table_desc * initial_table_array, 
	 * Root Table Array. This array contains the information of the RSDT/XSDT

	 * in a common, more useable format.

	 */

	status =

	    acpi_tb_parse_root_table(rsdp_address, ACPI_TABLE_ORIGIN_MAPPED);

	status = acpi_tb_parse_root_table(rsdp_address);

	return_ACPI_STATUS(status);

}