diff options
| author | Rob Herring <robh@kernel.org> | 2023-02-08 17:13:23 -0600 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2023-02-17 15:46:20 -0600 |
| commit | 16b0c7cad99e96b002e26f016f28150cc7c52514 (patch) | |
| tree | 0b3c3b90787ed4338d46b039170be1939b505107 | |
| parent | 2f0cb4753dd2b5fe71d04407213e2ef253dcdd32 (diff) | |
of: Use preferred of_property_read_* functions
Replace instances of of_get_property/of_find_property() with appropriate
typed of_property_read_*() functions.
Link: https://lore.kernel.org/all/20230215215502.690716-1-robh@kernel.org/
Signed-off-by: Rob Herring <robh@kernel.org>
| -rw-r--r-- | drivers/of/platform.c | 5 | ||||
| -rw-r--r-- | drivers/of/property.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index f7d796b54039..9f015ad73288 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -222,7 +222,6 @@ static struct amba_device *of_amba_device_create(struct device_node *node, struct device *parent) { struct amba_device *dev; - const void *prop; int ret; pr_debug("Creating amba device %pOF\n", node); @@ -250,9 +249,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, |