Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[karo-tx-linux.git] / arch / powerpc / kernel / pci-hotplug.c

diff --git a/arch/powerpc/kernel/pci-hotplug.c b/arch/powerpc/kernel/pci-hotplug.c
index c1e17ae68a08047a0a60154aed49684d8b4aad2f..5b789177aa29b65b35cf8ca3493e30511c0a74a5 100644 (file)
--- a/arch/powerpc/kernel/pci-hotplug.c
+++ b/arch/powerpc/kernel/pci-hotplug.c
@@ -98,8 +98,7 @@ void pcibios_add_pci_devices(struct pci_bus * bus)
                max = bus->busn_res.start;
                for (pass = 0; pass < 2; pass++) {
                        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 (pci_is_bridge(dev))
                                        max = pci_scan_bridge(bus, dev,
                                                              max, pass);
                        }