diff options
author | Yijing Wang <wangyijing@huawei.com> | 2014-05-04 00:23:45 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-27 16:58:07 -0400 |
commit | 5cbe5d15aefcd57038a90aa8db4787bc84968941 (patch) | |
tree | 8b233a2f04495c879e997881fd73b62221bfb567 | |
parent | 087cfa93e0fb5f06c0e976e6f468ffedc83b3223 (diff) |
PCI: cpcihp: 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>
-rw-r--r-- | drivers/pci/hotplug/cpci_hotplug_pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/cpci_hotplug_pci.c b/drivers/pci/hotplug/cpci_hotplug_pci.c index 8c1464851768..98433716978a 100644 --- a/drivers/pci/hotplug/cpci_hotplug_pci.c +++ b/drivers/pci/hotplug/cpci_hotplug_pci.c | |||
@@ -289,8 +289,7 @@ int __ref cpci_configure_slot(struct slot *slot) | |||
289 | list_for_each_entry(dev, &parent->devices, bus_list) | 289 | list_for_each_entry(dev, &parent->devices, bus_list) |
290 | if (PCI_SLOT(dev->devfn) != PCI_SLOT(slot->devfn)) | 290 | if (PCI_SLOT(dev->devfn) != PCI_SLOT(slot->devfn)) |
291 | continue; | 291 | continue; |
292 | if ((dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) || | 292 | if (pci_is_bridge(dev)) |
293 | (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) | ||
294 | pci_hp_add_bridge(dev); | 293 | pci_hp_add_bridge(dev); |
295 | 294 | ||
296 | 295 | ||