Merge tag 'dmaengine-4.21-rc1' of git://git.infradead.org/users/vkoul/slave-dma

[linux-2.6-block.git] / arch / powerpc / kernel / pci_of_scan.c

diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
index 98f04725def75f09dc924f7861d795c986ca98f0..24191ea2d9a78393d9f7ad26da0daabc0eb91ca1 100644 (file)
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
@@ -125,16 +125,13 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
                                 struct pci_bus *bus, int devfn)
 {
        struct pci_dev *dev;
-       const char *type;
 
        dev = pci_alloc_dev(bus);
        if (!dev)
                return NULL;
-       type = of_get_property(node, "device_type", NULL);
-       if (type == NULL)
-               type = "";
 
-       pr_debug("    create device, devfn: %x, type: %s\n", devfn, type);
+       pr_debug("    create device, devfn: %x, type: %s\n", devfn,
+                of_node_get_device_type(node));
 
        dev->dev.of_node = of_node_get(node);
        dev->dev.parent = bus->bridge;
@@ -167,12 +164,12 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
        /* Early fixups, before probing the BARs */
        pci_fixup_device(pci_fixup_early, dev);
 
-       if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {
+       if (of_node_is_type(node, "pci") || of_node_is_type(node, "pciex")) {
                /* a PCI-PCI bridge */
                dev->hdr_type = PCI_HEADER_TYPE_BRIDGE;
                dev->rom_base_reg = PCI_ROM_ADDRESS1;
                set_pcie_hotplug_bridge(dev);
-       } else if (!strcmp(type, "cardbus")) {
+       } else if (of_node_is_type(node, "cardbus")) {
                dev->hdr_type = PCI_HEADER_TYPE_CARDBUS;
        } else {
                dev->hdr_type = PCI_HEADER_TYPE_NORMAL;