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>

2 files changed, 3 insertions, 11 deletions

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 8647dc6f52d0..bdc1e8bf7e60 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -206,16 +206,9 @@ void pci_bus_add_devices(const struct pci_bus *bus)
 
         list_for_each_entry(dev, &bus->devices, bus_list) {
                 BUG_ON(!dev->is_added);
-
                 child = dev->subordinate;
-
-                if (!child)
-                        continue;
-                pci_bus_add_devices(child);
-
-                if (child->is_added)
-                        continue;
-                child->is_added = 1;
+                if (child)
+                        pci_bus_add_devices(child);
         }
 }
 
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)
         if (!bus->is_added) {
                 dev_dbg(&bus->dev, "fixups for bus\n");
                 pcibios_fixup_bus(bus);
-                if (pci_is_root_bus(bus))
-                        bus->is_added = 1;
+                bus->is_added = 1;
         }
 
         for (pass=0; pass < 2; pass++)