ACPI / battery: abort initialization earlier if acpi_disabled
If ACPI is disabled there's no need to schedule an async function call, the driver initialization can be aborted earlier in acpi_battery_init(). Signed-off-by: Luis Henriques <luis.henriques@canonical.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
030bbdbf4c
commit
e234b074c8
|
@ -1292,9 +1292,6 @@ static struct acpi_driver acpi_battery_driver = {
|
|||
|
||||
static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie)
|
||||
{
|
||||
if (acpi_disabled)
|
||||
return;
|
||||
|
||||
dmi_check_system(bat_dmi_table);
|
||||
|
||||
#ifdef CONFIG_ACPI_PROCFS_POWER
|
||||
|
@ -1313,6 +1310,9 @@ static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie)
|
|||
|
||||
static int __init acpi_battery_init(void)
|
||||
{
|
||||
if (acpi_disabled)
|
||||
return -ENODEV;
|
||||
|
||||
async_schedule(acpi_battery_init_async, NULL);
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue