On 17/11/18 9:11 am, Rob Herring wrote:
Remove directly accessing device_node.type pointer and use the accessors
instead. This will eventually allow removing the type pointer.


This description doesn't quite match what's being fixed - we're not accessing the .type pointer, we're getting the device_type property directly.

Cc: Frederic Barrat <fbar...@linux.vnet.ibm.com>
Cc: Andrew Donnellan <andrew.donnel...@au1.ibm.com>
Cc: Arnd Bergmann <a...@arndb.de>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Rob Herring <r...@kernel.org>

Apart from that:

Acked-by: Andrew Donnellan <andrew.donnel...@au1.ibm.com>

---
  drivers/misc/cxl/pci.c | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
index b66d832d3233..c79ba1c699ad 100644
--- a/drivers/misc/cxl/pci.c
+++ b/drivers/misc/cxl/pci.c
@@ -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++;
        }


--
Andrew Donnellan              OzLabs, ADL Canberra
andrew.donnel...@au1.ibm.com  IBM Australia Limited

Reply via email to