diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:14:44 -0700 |
|---|---|---|
| committer | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:14:44 -0700 |
| commit | 14462649a2dff2ee5571800d327501b2361e7b03 (patch) | |
| tree | 1076b99ae74e34c37d0b366f2dc57afed63268f0 | |
| parent | e53ba5988b55adb19610c285959aec5b5a4b7d01 (diff) | |
| download | linux-yinghai-14462649a2dff2ee5571800d327501b2361e7b03.tar.gz | |
PCI: Use __pci_bus_size_bridges() directly in pci_assign_unassigned_bus_resources()
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 <yinghai@kernel.org>
| -rw-r--r-- | 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 85f7ec7340fa86..56155c95a506fa 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)); |