[PATCH] of: Use preferred of_property_read_* functions

DORMANTno replies LANDED

From: Rob Herring <robh@kernel.org>
Date: 2023-02-15 21:55:13
Also in: lkml
Subsystem: open firmware and flattened device tree, the rest · Maintainers: Rob Herring, Saravana Kannan, Linus Torvalds

Landed in mainline as 16b0c7cad99e on 2023-02-17.

Replace instances of of_get_property/of_find_property() with appropriate
typed of_property_read_*() functions.

Signed-off-by: Rob Herring <robh@kernel.org>
---
 drivers/of/platform.c | 4 +---
 drivers/of/property.c | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 284379e67649..472e1706983d 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -250,9 +250,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node,
 		of_device_make_bus_id(&dev->dev);
 
 	/* Allow the HW Peripheral ID to be overridden */
-	prop = of_get_property(node, "arm,primecell-periphid", NULL);
-	if (prop)
-		dev->periphid = of_read_ulong(prop, 1);
+	of_property_read_u32(node, "arm,primecell-periphid", &dev->periphid);
 
 	ret = of_address_to_resource(node, 0, &dev->res);
 	if (ret) {
diff --git a/drivers/of/property.c b/drivers/of/property.c
index ff71d2ac26cb..a229536f7564 100644
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@ -1358,7 +1358,7 @@ static struct device_node *parse_gpio_compat(struct device_node *np,
 	 * Ignore node with gpio-hog property since its gpios are all provided
 	 * by its parent.
 	 */
-	if (of_find_property(np, "gpio-hog", NULL))
+	if (of_property_read_bool(np, "gpio-hog"))
 		return NULL;
 
 	if (of_parse_phandle_with_args(np, prop_name, "#gpio-cells", index,
-- 
2.39.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help