PCI: rpaphp: 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>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index 4fcdeedda31b8eedc44101fb2ecc05d45bcb7f1c..7660232ef4607f45377c62452c92661d7d54d2a0 100644 (file)
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -157,8 +157,7 @@ static void dlpar_pci_add_bus(struct device_node *dn)
        }
 
        /* Scan below the new bridge */
-       if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
-           dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)
+       if (pci_is_bridge(dev))
                of_scan_pci_bridge(dev);
 
        /* Map IO space for child bus, which may or may not succeed */