PCI: Use of_property_present() for testing DT property presence

It is preferred to use typed property access functions (i.e.
of_property_read_<type> functions) rather than low-level
of_get_property()/of_find_property() functions for reading properties. As
part of this, convert of_get_property()/of_find_property() calls to the
recently added of_property_present() helper when we just want to test for
presence of a property and nothing more.

Link: https://lore.kernel.org/r/20230310144719.1544443-1-robh@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>  # pcie-mediatek

diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c
index 74c109f14ff0023bf7f6335f4f975dd7220c27af..79630885b9c823afb09df210b98615d422e0fb06 100644 (file)
--- a/drivers/pci/controller/pci-tegra.c
+++ b/drivers/pci/controller/pci-tegra.c
@@ -1375,7 +1375,7 @@ static int tegra_pcie_phys_get(struct tegra_pcie *pcie)
        struct tegra_pcie_port *port;
        int err;
 
-       if (!soc->has_gen2 || of_find_property(np, "phys", NULL) != NULL)
+       if (!soc->has_gen2 || of_property_present(np, "phys"))
                return tegra_pcie_phys_get_legacy(pcie);
 
        list_for_each_entry(port, &pcie->ports, list) {
@@ -1944,7 +1944,7 @@ static bool of_regulator_bulk_available(struct device_node *np,
        for (i = 0; i < num_supplies; i++) {
                snprintf(property, 32, "%s-supply", supplies[i].supply);
 
-               if (of_find_property(np, property, NULL) == NULL)
+               if (!of_property_present(np, property))
                        return false;
        }
 

diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
index ae5ad05ddc1d44dfba4a1e4cfd761322b81a6cf2..31de7a29192c8fda5f78802a55bda5aa73d62312 100644 (file)
--- a/drivers/pci/controller/pcie-mediatek.c
+++ b/drivers/pci/controller/pcie-mediatek.c
@@ -643,7 +643,7 @@ static int mtk_pcie_setup_irq(struct mtk_pcie_port *port,
                return err;
        }
 
-       if (of_find_property(dev->of_node, "interrupt-names", NULL))
+       if (of_property_present(dev->of_node, "interrupt-names"))
                port->irq = platform_get_irq_byname(pdev, "pcie_irq");
        else
                port->irq = platform_get_irq(pdev, port->slot);

diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index 491986197c4791ba08b13eee1f7ef1ce11e5ae8d..2316de0fd19827c3c70fc030a9da4767700ee2ae 100644 (file)
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -278,7 +278,7 @@ int rpaphp_check_drc_props(struct device_node *dn, char *drc_name,
                return -EINVAL;
        }
 
-       if (of_find_property(dn->parent, "ibm,drc-info", NULL))
+       if (of_property_present(dn->parent, "ibm,drc-info"))
                return rpaphp_check_drc_props_v2(dn, drc_name, drc_type,
                                                be32_to_cpu(*my_index));
        else
@@ -440,7 +440,7 @@ int rpaphp_add_slot(struct device_node *dn)
        if (!of_node_name_eq(dn, "pci"))
                return 0;
 
-       if (of_find_property(dn, "ibm,drc-info", NULL))
+       if (of_property_present(dn, "ibm,drc-info"))
                return rpaphp_drc_info_add_slot(dn);
        else
                return rpaphp_drc_add_slot(dn);

diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index 196834ed44fe84595a696159dd42deb24ec42b71..e085f2eca372f6c72de7cd79ff8d9edbf081cbdf 100644 (file)
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -447,7 +447,7 @@ static int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *
                return -ENODEV;
 
        /* Local interrupt-map in the device node? Use it! */
-       if (of_get_property(dn, "interrupt-map", NULL)) {
+       if (of_property_present(dn, "interrupt-map")) {
                pin = pci_swizzle_interrupt_pin(pdev, pin);
                ppnode = dn;
        }