Skip to contentSkip to conversation

iommu: Use of_property_present() for testing DT property presence

PATCH Applied Rob Herring 3 participants 3 messages Mar 10, 2023 – Mar 22, 2023

Subsystems (2)
IOMMU Arm SMMU drivers
lore
Share & tools
lore

Rob Herring

author
#0 lore raw

PATCH 1/1 iommu: 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.

Signed-off-by Rob Herring <[email protected]>
---
 drivers/iommu/arm/arm-smmu/arm-smmu.c | 2 +-
 drivers/iommu/ipmmu-vmsa.c            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/arm/arm-smmu/arm-smmu.c +1 -1
index 2ff7a72cf377..d0843caf8760 100644
@@ -139,7 +139,7 @@ static int arm_smmu_register_legacy_master(struct device *dev,
 	int err;
 
 	np = dev_get_dev_node(dev);
-	if (!np || !of_find_property(np, "#stream-id-cells", NULL)) {
+	if (!np || !of_property_present(np, "#stream-id-cells")) {
 		of_node_put(np);
 		return -ENODEV;
 	}
drivers/iommu/ipmmu-vmsa.c +1 -1
index bdf1a4e5eae0..f4470303d906 100644
@@ -1014,7 +1014,7 @@ static int ipmmu_probe(struct platform_device *pdev)
 	 * the lack of has_cache_leaf_nodes flag or renesas,ipmmu-main property.
 	 */
 	if (!mmu->features->has_cache_leaf_nodes ||
-	    !of_find_property(pdev->dev.of_node, "renesas,ipmmu-main", NULL))
+	    !of_property_present(pdev->dev.of_node, "renesas,ipmmu-main"))
 		mmu->root = mmu;
 	else
 		mmu->root = ipmmu_find_root();
Signature · 1 line
2.39.2
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Rob Herring

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.

Oh, neat!

Quoted 24 lines
Signed-off-by Rob Herring <[email protected]>
---
  drivers/iommu/arm/arm-smmu/arm-smmu.c | 2 +-
  drivers/iommu/ipmmu-vmsa.c            | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/arm/arm-smmu/arm-smmu.c +1 -1
index 2ff7a72cf377..d0843caf8760 100644
@@ -139,7 +139,7 @@ static int arm_smmu_register_legacy_master(struct device *dev,
  	int err;
 
  	np = dev_get_dev_node(dev);
-	if (!np || !of_find_property(np, "#stream-id-cells", NULL)) {
+	if (!np || !of_property_present(np, "#stream-id-cells")) {
  		of_node_put(np);
  		return -ENODEV;
  	}
drivers/iommu/ipmmu-vmsa.c +0 -0
index bdf1a4e5eae0..f4470303d906 100644

drivers/iommu/ipmmu-vmsa.c static int ipmmu_probe(struct platform_device *pdev) · line 1017

Quoted 5 lines
drivers/iommu/ipmmu-vmsa.c +1 -1
@@ -1014,7 +1014,7 @@ static int ipmmu_probe(struct platform_device *pdev)
  	 * the lack of has_cache_leaf_nodes flag or renesas,ipmmu-main property.
  	 */
  	if (!mmu->features->has_cache_leaf_nodes ||
-	    !of_find_property(pdev->dev.of_node, "renesas,ipmmu-main", NULL))
+	    !of_property_present(pdev->dev.of_node, "renesas,ipmmu-main"))

On reflection, weird that this works the way it does instead of actually following the phandle, but oh well. Definitely beyond the scope of this cleanup :)

Reviewed-by Robin Murphy <[email protected]>
Quoted 3 lines
drivers/iommu/ipmmu-vmsa.c +0 -0
  		mmu->root = mmu;
  	else
  		mmu->root = ipmmu_find_root();
maintainer Applied
#2 lore raw
In reply to Rob Herring
Quoted 3 lines · Rob Herring
 drivers/iommu/arm/arm-smmu/arm-smmu.c | 2 +-
 drivers/iommu/ipmmu-vmsa.c            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.