Commit 0e46517d authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

ACPI: call init_acpi_device_notify() explicitly rather than as initcall

This patch makes acpi_init() call init_acpi_device_notify() directly.
Previously, init_acpi_device_notify() was an arch_initcall (sequence 3),
so it was called before acpi_init() (a subsys_initcall at sequence 4).

init_acpi_device_notify() sets the platform_notify and
platform_notify_remove function pointers.  These pointers
are not used until acpi_init() enumerates ACPI devices in
this path:

				<use platform_notify>

So it is sufficient to have acpi_init() call init_acpi_device_notify()
directly before it enumerates devices.
Signed-off-by: default avatarBjorn Helgaas <>
Signed-off-by: default avatarLen Brown <>
parent 84f810c3
......@@ -855,6 +855,7 @@ static int __init acpi_init(void)
acpi_kobj = NULL;
result = acpi_bus_init();
if (!result) {
......@@ -286,10 +286,8 @@ static int acpi_platform_notify_remove(struct device *dev)
return 0;
static int __init init_acpi_device_notify(void)
int __init init_acpi_device_notify(void)
if (acpi_disabled)
return 0;
if (platform_notify || platform_notify_remove) {
printk(KERN_ERR PREFIX "Can't use platform_notify\n");
return 0;
......@@ -298,5 +296,3 @@ static int __init init_acpi_device_notify(void)
platform_notify_remove = acpi_platform_notify_remove;
return 0;
/* For use by Linux/ACPI infrastructure, not drivers */
int init_acpi_device_notify(void);
int acpi_scan_init(void);
int acpi_system_init(void);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment