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

Commit 516ca223 authored by Jiang Liu's avatar Jiang Liu Committed by Bjorn Helgaas
Browse files

PCI/ACPI: Combine duplicate adjacent "if" tests 



[bhelgaas: split out from acpi_pci_roots removal]
Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent f722406f

drivers/acpi/pci_root.c

+2 −3
Original line number Diff line number Diff line
@@ -536,11 +536,10 @@ static int acpi_pci_root_add(struct acpi_device *device, 
	if (system_state != SYSTEM_BOOTING) {

		pcibios_resource_survey_bus(root->bus);

		pci_assign_unassigned_bus_resources(root->bus);

	}



		/* need to after hot-added ioapic is registered */

	if (system_state != SYSTEM_BOOTING)

		pci_enable_bridges(root->bus);

	}



	pci_bus_add_devices(root->bus);

	return 1;