niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

ACPI / bus: Move ACPI bus type registration

Browse source 
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: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Rafael J. Wysocki 2015-07-17 22:54:09 +02:00
parent 5894b0c46e
commit 1dcc3d3362
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/acpi/bus.c
View file

@ -1039,7 +1039,9 @@ static int __init acpi_bus_init(void)
*/ */
acpi_root_dir = proc_mkdir(ACPI_BUS_FILE_ROOT, NULL); acpi_root_dir = proc_mkdir(ACPI_BUS_FILE_ROOT, NULL);
return 0; result = bus_register(&acpi_bus_type);
if (!result)
return 0;
/* Mimic structured exception handling */ /* Mimic structured exception handling */
error1: error1:

6
drivers/acpi/scan.c
View file

@ -1891,12 +1891,6 @@ int __init acpi_scan_init(void)
{ {
int result; 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_root_init();
acpi_pci_link_init(); acpi_pci_link_init();
acpi_processor_init(); acpi_processor_init();