Commit 0f66af53 authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Len Brown
Browse files

ACPI: battery: asynchronous init 



The battery driver tends to take quite some time to initialize
(100ms-300ms is quite typical).
This patch initializes the batter driver asynchronously, so that other
things in the kernel can initialize in parallel to this 300 msec.

As part of this, the battery driver had to move to the back
of the ACPI init order (hence the Makefile change).
Without this move, the next ACPI driver would just block
on the ACPI/devicee layer semaphores until the battery driver was
done anyway, not gaining any boot time.

Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 8e0ee43b

drivers/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ obj-y += scan.o 
# Keep EC driver first. Initialization of others depend on it.

obj-y				+= ec.o

obj-$(CONFIG_ACPI_AC) 		+= ac.o

obj-$(CONFIG_ACPI_BATTERY)	+= battery.o

obj-$(CONFIG_ACPI_BUTTON)	+= button.o

obj-$(CONFIG_ACPI_FAN)		+= fan.o

obj-$(CONFIG_ACPI_DOCK)		+= dock.o
@@ -57,5 +56,6 @@ obj-$(CONFIG_ACPI_DEBUG) += debug.o 
obj-$(CONFIG_ACPI_NUMA)		+= numa.o

obj-$(CONFIG_ACPI_HOTPLUG_MEMORY)	+= acpi_memhotplug.o

obj-$(CONFIG_ACPI_PROCFS_POWER)	+= cm_sbs.o

obj-$(CONFIG_ACPI_BATTERY)	+= battery.o

obj-$(CONFIG_ACPI_SBS)		+= sbshc.o

obj-$(CONFIG_ACPI_SBS)		+= sbs.o

drivers/acpi/battery.c

+11 −4
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/init.h>

#include <linux/types.h>

#include <linux/jiffies.h>

#include <linux/async.h>



#ifdef CONFIG_ACPI_PROCFS_POWER

#include <linux/proc_fs.h>
@@ -901,21 +902,27 @@ static struct acpi_driver acpi_battery_driver = { 
		},

};



static int __init acpi_battery_init(void)

static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie)

{

	if (acpi_disabled)

		return -ENODEV;

		return;

#ifdef CONFIG_ACPI_PROCFS_POWER

	acpi_battery_dir = acpi_lock_battery_dir();

	if (!acpi_battery_dir)

		return -ENODEV;

		return;

#endif

	if (acpi_bus_register_driver(&acpi_battery_driver) < 0) {

#ifdef CONFIG_ACPI_PROCFS_POWER

		acpi_unlock_battery_dir(acpi_battery_dir);

#endif

		return -ENODEV;

		return;

	}

	return;

}



static int __init acpi_battery_init(void)

{

	async_schedule(acpi_battery_init_async, NULL);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE