summaryrefslogtreecommitdiffstats
path: root/drivers/pci/setup-bus.c
diff options
context:
space:
mode:
authorYijing Wang <wangyijing@huawei.com>2014-05-04 06:23:38 +0200
committerBjorn Helgaas <bhelgaas@google.com>2014-05-27 22:53:41 +0200
commit6788a51fe3391817c8ded5f43dd4c57f3d212c17 (patch)
tree499f69d27cb71ccdd3127cc030e2bf96e1fcbe02 /drivers/pci/setup-bus.c
parentPCI: Add new pci_is_bridge() interface (diff)
downloadlinux-6788a51fe3391817c8ded5f43dd4c57f3d212c17.tar.xz
linux-6788a51fe3391817c8ded5f43dd4c57f3d212c17.zip
PCI: Use pci_is_bridge() to simplify code
Use pci_is_bridge() to simplify code. No functional change. Requires: 326c1cdae741 PCI: Rename pci_is_bridge() to pci_has_subordinate() Requires: 1c86438c9423 PCI: Add new pci_is_bridge() interface Signed-off-by: Yijing Wang <wangyijing@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/setup-bus.c')
-rw-r--r--drivers/pci/setup-bus.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 138bdd6393be..e399d00ed5fb 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1629,9 +1629,7 @@ void pci_assign_unassigned_bus_resources(struct pci_bus *bus)
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)
+ if (pci_is_bridge(dev) && pci_has_subordinate(dev))
__pci_bus_size_bridges(dev->subordinate,
&add_list);
up_read(&pci_bus_sem);