Now __pci_bus_size_bridges() will not include self bridge.
So we don't need to have our own version in
pci_assign_unassigned_bus_resources anymore.
Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
drivers/pci/setup-bus.c | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 85f7ec73..56155c9 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1558,17 +1558,11 @@
EXPORT_SYMBOL_GPL(pci_assign_unassigned_bridge_resources);
void pci_assign_unassigned_bus_resources(struct pci_bus *bus)
{
- struct pci_dev *dev;
LIST_HEAD(add_list); /* list of resources that
want additional resources */
down_read(&pci_bus_sem);
- list_for_each_entry(dev, &bus->devices, bus_list)
- if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
- dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)
- if (dev->subordinate)
- __pci_bus_size_bridges(dev->subordinate,
- &add_list, true);
+ __pci_bus_size_bridges(bus, &add_list, false);
up_read(&pci_bus_sem);
__pci_bus_assign_resources(bus, &add_list, NULL);
BUG_ON(!list_empty(&add_list));
--
1.7.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
