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

Commit 1dcc3d33 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI / bus: Move ACPI bus type registration 



Move the registration of the ACPI bus type to acpi_bus_init() and
avoid using ACPI going forward if it fails (too many things depend on
the presence of the ACPI bus type).

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 5894b0c4

drivers/acpi/bus.c

+3 −1
Original line number Diff line number Diff line
@@ -1039,6 +1039,8 @@ static int __init acpi_bus_init(void) 
	 */

	acpi_root_dir = proc_mkdir(ACPI_BUS_FILE_ROOT, NULL);



	result = bus_register(&acpi_bus_type);

	if (!result)

		return 0;



	/* Mimic structured exception handling */

drivers/acpi/scan.c

+0 −6
Original line number Diff line number Diff line
@@ -1891,12 +1891,6 @@ int __init acpi_scan_init(void) 
{

	int result;



	result = bus_register(&acpi_bus_type);

	if (result) {

		/* We don't want to quit even if we failed to add suspend/resume */

		printk(KERN_ERR PREFIX "Could not register bus type\n");

	}



	acpi_pci_root_init();

	acpi_pci_link_init();

	acpi_processor_init();