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

Commit 45c9f78b authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Add __init for ACPICA initializers/finalizers. 



This patch adds __init to the ACPICA documented initializers:
  acpi_initialize_tables()
  acpi_initialize_subsystem()
  acpi_load_tables()
  acpi_enable_subsystem()
  acpi_initialize_objects()
and to acpi_reallocate_root_table(), acpi_find_root_pointer() which
are also meant to be called only during initialization.

This patch adds __init to the ACPICA documented finalizer:
  acpi_terminate()
as this finalizer is only called in __init function now.

This change helps to reduce source code differences between
ACPICA upstream and Linux.

[rjw: Changelog]
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 40bce100

drivers/acpi/acpica/tbutils.c

+1 −2
Original line number Diff line number Diff line
@@ -430,8 +430,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)

acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)

{

	struct acpi_table_rsdp *rsdp;

	u32 table_entry_size;

drivers/acpi/acpica/tbxface.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ ACPI_EXPORT_SYMBOL_INIT(acpi_initialize_tables) 
 *              kernel.

 *

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

acpi_status acpi_reallocate_root_table(void)

acpi_status __init acpi_reallocate_root_table(void)

{

	acpi_status status;

drivers/acpi/acpica/tbxfload.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static acpi_status acpi_tb_load_namespace(void); 
 *

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



acpi_status acpi_load_tables(void)

acpi_status __init acpi_load_tables(void)

{

	acpi_status status;

drivers/acpi/acpica/tbxfroot.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp) 
 *

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



acpi_status acpi_find_root_pointer(acpi_size *table_address)

acpi_status __init acpi_find_root_pointer(acpi_size *table_address)

{

	u8 *table_ptr;

	u8 *mem_rover;

drivers/acpi/acpica/utxface.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ ACPI_MODULE_NAME("utxface") 
 * DESCRIPTION: Shutdown the ACPICA subsystem and release all resources.

 *

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

acpi_status acpi_terminate(void)

acpi_status __init acpi_terminate(void)

{

	acpi_status status;