PCI/ACPI: Combine duplicate adjacent "if" tests

[bhelgaas: split out from acpi_pci_roots removal]
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Jiang Liu 2013-05-28 18:04:46 -06:00 committed by Bjorn Helgaas
parent f722406faa
commit 516ca22307

View File

@ -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)
/* need to after hot-added ioapic is registered */
pci_enable_bridges(root->bus);
}
pci_bus_add_devices(root->bus);
return 1;