PCI: cpcihp: Use pci_is_bridge() to simplify code
authorYijing Wang <wangyijing@huawei.com>
Sun, 4 May 2014 04:23:45 +0000 (12:23 +0800)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 27 May 2014 20:58:07 +0000 (14:58 -0600)
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>
drivers/pci/hotplug/cpci_hotplug_pci.c

index 8c1464851768140f0c31c27f60f04f93df0ff8c6..98433716978a08fcef39e48e4182ef6b3cd2571b 100644 (file)
@@ -289,8 +289,7 @@ int __ref cpci_configure_slot(struct slot *slot)
        list_for_each_entry(dev, &parent->devices, bus_list)
                if (PCI_SLOT(dev->devfn) != PCI_SLOT(slot->devfn))
                        continue;
-               if ((dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) ||
-                   (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS))
+               if (pci_is_bridge(dev))
                        pci_hp_add_bridge(dev);