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>

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 1dd6f6c8587442ab1fcbdf7d7bd78d98ef551a9b..eb09053c0fce54f2d95e45fa899182cdccb6754c 100644 (file)
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -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;