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

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

ACPI: call acpi_ec_init() explicitly rather than as initcall 



This patch makes acpi_init() call acpi_ec_init() directly.
Previously, both were subsys_initcalls.  acpi_ec_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>
CC: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent e747f274

drivers/acpi/bus.c

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



	acpi_scan_init();

	acpi_ec_init();

	return result;

}

drivers/acpi/ec.c

+1 −6
Original line number Diff line number Diff line
@@ -1069,13 +1069,10 @@ static struct acpi_driver acpi_ec_driver = { 
		},

};



static int __init acpi_ec_init(void)

int __init acpi_ec_init(void)

{

	int result = 0;



	if (acpi_disabled)

		return 0;



	acpi_ec_dir = proc_mkdir(ACPI_EC_CLASS, acpi_root_dir);

	if (!acpi_ec_dir)

		return -ENODEV;
@@ -1090,8 +1087,6 @@ static int __init acpi_ec_init(void) 
	return result;

}



subsys_initcall(acpi_ec_init);



/* EC driver currently not unloadable */

#if 0

static void __exit acpi_ec_exit(void)

drivers/acpi/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ extern int acpi_power_nocheck; 
/* --------------------------------------------------------------------------

                                  Embedded Controller

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

int acpi_ec_init(void);

int acpi_ec_ecdt_probe(void);

int acpi_boot_ec_enable(void);