PCI: pciehp: 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>

diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c
index 1b533060ce650778bbdc74e2a676d333c9afe7d7..b6cb1df670972bf9abe711c8ed1e1e16d069ada4 100644 (file)
--- a/drivers/pci/hotplug/pciehp_pci.c
+++ b/drivers/pci/hotplug/pciehp_pci.c
@@ -62,8 +62,7 @@ int pciehp_configure_device(struct slot *p_slot)
        }
 
        list_for_each_entry(dev, &parent->devices, bus_list)
-               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);
 
        pci_assign_unassigned_bridge_resources(bridge);