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

Commit dd272b57 authored by Len Brown's avatar Len Brown
Browse files

ACPI: add __init to acpi_initialize_subsystem() 



Add __init to:
acpi_initialize_subsystem() (and un-export it)
acpi_os_initialize()

Add __initdata to:
acpi_osl_dmi_table[]

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent f507654d

drivers/acpi/osl.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -86,7 +86,7 @@ int osi_linux; /* disable _OSI(Linux) by default */ 








#ifdef CONFIG_DMI

#ifdef CONFIG_DMI

static struct dmi_system_id acpi_osl_dmi_table[];

static struct __initdata dmi_system_id acpi_osl_dmi_table[];

#endif

#endif





static void __init acpi_request_region (struct acpi_generic_address *addr,

static void __init acpi_request_region (struct acpi_generic_address *addr,
@@ -137,7 +137,7 @@ static int __init acpi_reserve_resources(void) 
}

}

device_initcall(acpi_reserve_resources);

device_initcall(acpi_reserve_resources);





acpi_status acpi_os_initialize(void)

acpi_status __init acpi_os_initialize(void)

{

{

	dmi_check_system(acpi_osl_dmi_table);

	dmi_check_system(acpi_osl_dmi_table);

	return AE_OK;

	return AE_OK;
@@ -1243,7 +1243,7 @@ static int dmi_osi_linux(struct dmi_system_id *d) 
}

}

#endif

#endif





static struct dmi_system_id acpi_osl_dmi_table[] = {

static struct dmi_system_id acpi_osl_dmi_table[] __initdata = {

#ifdef	OSI_LINUX_ENABLED

#ifdef	OSI_LINUX_ENABLED

	/*

	/*

	 * Boxes that need NOT _OSI(Linux)

	 * Boxes that need NOT _OSI(Linux)

drivers/acpi/utilities/utxface.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -61,7 +61,7 @@ ACPI_MODULE_NAME("utxface") 
 *              called, so any early initialization belongs here.

 *              called, so any early initialization belongs here.

 *

 *

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

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

acpi_status acpi_initialize_subsystem(void)

acpi_status __init acpi_initialize_subsystem(void)

{

{

	acpi_status status;

	acpi_status status;
@@ -108,8 +108,6 @@ acpi_status acpi_initialize_subsystem(void) 
	return_ACPI_STATUS(status);

	return_ACPI_STATUS(status);

}

}





ACPI_EXPORT_SYMBOL(acpi_initialize_subsystem)



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

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

 *

 *

 * FUNCTION:    acpi_enable_subsystem

 * FUNCTION:    acpi_enable_subsystem

include/acpi/acpiosxf.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ struct acpi_signal_fatal_info { 
/*

/*

 * OSL Initialization and shutdown primitives

 * OSL Initialization and shutdown primitives

 */

 */

acpi_status acpi_os_initialize(void);

acpi_status __initdata acpi_os_initialize(void);





acpi_status acpi_os_terminate(void);

acpi_status acpi_os_terminate(void);

include/acpi/acpixf.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -55,7 +55,7 @@ acpi_status 
acpi_initialize_tables(struct acpi_table_desc *initial_storage,

acpi_initialize_tables(struct acpi_table_desc *initial_storage,

		       u32 initial_table_count, u8 allow_resize);

		       u32 initial_table_count, u8 allow_resize);





acpi_status acpi_initialize_subsystem(void);

acpi_status __init acpi_initialize_subsystem(void);





acpi_status acpi_enable_subsystem(u32 flags);

acpi_status acpi_enable_subsystem(u32 flags);