]> www.infradead.org Git - nvme.git/commitdiff
iommu: Use of_property_present()
authorRob Herring (Arm) <robh@kernel.org>
Wed, 31 Jul 2024 19:12:44 +0000 (13:12 -0600)
committerJoerg Roedel <jroedel@suse.de>
Wed, 4 Sep 2024 09:31:01 +0000 (11:31 +0200)
Use of_property_present() to test for property presence rather than
of_(find|get)_property(). This is part of a larger effort to remove
callers of of_find_property() and similar functions. of_find_property()
leaks the DT struct property and data pointers which is a problem for
dynamically allocated nodes which may be freed.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/20240731191312.1710417-6-robh@kernel.org
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/fsl_pamu_domain.c
drivers/iommu/of_iommu.c

index e9d2bff4659b7c09f4e14ea14032c861c088f7e1..30be786bff11e6da62c208387f26c9f435116f48 100644 (file)
@@ -416,14 +416,12 @@ static struct iommu_group *fsl_pamu_device_group(struct device *dev)
 
 static struct iommu_device *fsl_pamu_probe_device(struct device *dev)
 {
-       int len;
-
        /*
         * uboot must fill the fsl,liodn for platform devices to be supported by
         * the iommu.
         */
        if (!dev_is_pci(dev) &&
-           !of_get_property(dev->of_node, "fsl,liodn", &len))
+           !of_property_present(dev->of_node, "fsl,liodn"))
                return ERR_PTR(-ENODEV);
 
        return &pamu_iommu;
index 78d61da75257c258cfaed37869220d32ad555eeb..e7a6a1611d193bce7ea71537a7e339904a9341b5 100644 (file)
@@ -214,7 +214,7 @@ void of_iommu_get_resv_regions(struct device *dev, struct list_head *list)
                 * that represent reservations in the IOVA space, which are regions that should
                 * not be mapped.
                 */
-               if (of_find_property(it.node, "reg", NULL)) {
+               if (of_property_present(it.node, "reg")) {
                        err = of_address_to_resource(it.node, 0, &phys);
                        if (err < 0) {
                                dev_err(dev, "failed to parse memory region %pOF: %d\n",