cxl: Use device_type helpers to access the node type
authorRob Herring <robh@kernel.org>
Fri, 16 Nov 2018 22:11:02 +0000 (16:11 -0600)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 26 Nov 2018 11:33:37 +0000 (22:33 +1100)
Remove directly accessing device_node.type pointer and use the
accessors instead. This will eventually allow removing the type
pointer.

Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
drivers/misc/cxl/pci.c

index b66d832d3233b65369a10c843843600d7563529c..c79ba1c699ad1005973474b705065f4c5f8773c7 100644 (file)
@@ -1718,7 +1718,6 @@ int cxl_slot_is_switched(struct pci_dev *dev)
 {
        struct device_node *np;
        int depth = 0;
-       const __be32 *prop;
 
        if (!(np = pci_device_to_OF_node(dev))) {
                pr_err("cxl: np = NULL\n");
@@ -1727,8 +1726,7 @@ int cxl_slot_is_switched(struct pci_dev *dev)
        of_node_get(np);
        while (np) {
                np = of_get_next_parent(np);
-               prop = of_get_property(np, "device_type", NULL);
-               if (!prop || strcmp((char *)prop, "pciex"))
+               if (!of_node_is_type(np, "pciex"))
                        break;
                depth++;
        }