PCI: Clean up usages of pci_bus->is_added (981cf9ea) · Commits · 戴 / test

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>

drivers/pci/bus.c

+2 −9

Original line number	Diff line number	Diff line
		@@ -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;
		if (child)
		pci_bus_add_devices(child);

		if (child->is_added)
		continue;
		child->is_added = 1;
		}
		}

drivers/pci/probe.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1627,7 +1627,6 @@ 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;
		}

Admin message