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

Commit 141a0af3 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

ACPI: call acpi_system_init() explicitly rather than as initcall 



This patch makes acpi_init() call acpi_system_init() directly.
Previously, both were subsys_initcalls.  acpi_system_init()
must happen after acpi_init(), and it's better to call it
explicitly rather than rely on link ordering.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 44515374

drivers/acpi/bus.c

+1 −0
Original line number Diff line number Diff line
@@ -882,6 +882,7 @@ static int __init acpi_init(void) 
	acpi_scan_init();

	acpi_ec_init();

	acpi_power_init();

	acpi_system_init();

	return result;

}

drivers/acpi/internal.h

+1 −0
Original line number Diff line number Diff line 
/* For use by Linux/ACPI infrastructure, not drivers */



int acpi_scan_init(void);

int acpi_system_init(void);



/* --------------------------------------------------------------------------

                                  Power Resource

drivers/acpi/system.c

+2 −7
Original line number Diff line number Diff line
@@ -571,12 +571,9 @@ static int acpi_system_procfs_init(void) 
}

#endif



static int __init acpi_system_init(void)

int __init acpi_system_init(void)

{

	int result = 0;



	if (acpi_disabled)

		return 0;

	int result;



	result = acpi_system_procfs_init();

	if (result)
@@ -586,5 +583,3 @@ static int __init acpi_system_init(void) 


	return result;

}
 


subsys_initcall(acpi_system_init);