diff options
author | Jiang Liu <liuj97@gmail.com> | 2013-04-12 01:44:16 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-12 17:38:25 -0400 |
commit | 981cf9ea9a6a6c422e51fc04bedad00b7792ccbc (patch) | |
tree | 33efdbede82837af7a0034f809ffb484a326dab5 /drivers/pci/probe.c | |
parent | 1e89d268e7a83d8388d4d09d3f2089ced72cc15f (diff) |
PCI: Clean up usages of pci_bus->is_added
Now pci_bus->is_added is only used to guard invoking of
pcibios_fixup_bus() in pci_scan_child_bus(), so just set
it directly after the fixups and remove the other test
and set in pci_bus_add_devices().
[bhelgaas: changelog]
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Yinghai Lu <yinghai@kernel.org>
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r-- | drivers/pci/probe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index b494066ef32f..45c93b39af35 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -1627,8 +1627,7 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus) | |||
1627 | if (!bus->is_added) { | 1627 | if (!bus->is_added) { |
1628 | dev_dbg(&bus->dev, "fixups for bus\n"); | 1628 | dev_dbg(&bus->dev, "fixups for bus\n"); |
1629 | pcibios_fixup_bus(bus); | 1629 | pcibios_fixup_bus(bus); |
1630 | if (pci_is_root_bus(bus)) | 1630 | bus->is_added = 1; |
1631 | bus->is_added = 1; | ||
1632 | } | 1631 | } |
1633 | 1632 | ||
1634 | for (pass=0; pass < 2; pass++) | 1633 | for (pass=0; pass < 2; pass++) |