diff options
| author | Jiang Liu <jiang.liu@huawei.com> | 2013-05-29 02:04:46 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-05-29 22:35:33 +0200 |
| commit | 516ca22307df6ba972e9719ec756a356187cdde7 (patch) | |
| tree | 6fac3fa22ee39de114359910b416d2277479c034 /drivers/acpi/pci_root.c | |
| parent | Linux 3.10-rc1 (diff) | |
| download | linux-516ca22307df6ba972e9719ec756a356187cdde7.tar.xz linux-516ca22307df6ba972e9719ec756a356187cdde7.zip | |
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>
Diffstat (limited to 'drivers/acpi/pci_root.c')
| -rw-r--r-- | drivers/acpi/pci_root.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 1dd6f6c85874..eb09053c0fce 100644 --- 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; |