The use of of_property_read_bool() for non-boolean properties is
deprecated in favor of of_property_present() when testing for property
presence.
While we're here, simplify the 2 checks into a single check as they
only differ in printing "NAND" vs "OneNAND" in the warning.
Signed-off-by: Rob Herring (Arm) <robh@xxxxxxxxxx>
---
Possibly this check could just be removed altogether?
---
drivers/memory/omap-gpmc.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index e2a75a52563f..329bad46065c 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -2226,21 +2226,11 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
goto err;
}
- if (of_node_name_eq(child, "nand")) {
+ if (of_node_name_eq(child, "nand") || of_node_name_eq(child, "onenand")) {
/* Warn about older DT blobs with no compatible property */
- if (!of_property_read_bool(child, "compatible")) {
+ if (!of_property_present(child, "compatible")) {
dev_warn(&pdev->dev,
- "Incompatible NAND node: missing compatible");
- ret = -EINVAL;
- goto err;
- }
- }
-
- if (of_node_name_eq(child, "onenand")) {
- /* Warn about older DT blobs with no compatible property */
- if (!of_property_read_bool(child, "compatible")) {
- dev_warn(&pdev->dev,
- "Incompatible OneNAND node: missing compatible");
+ "Incompatible '%pOFn' node: missing compatible", child);
ret = -EINVAL;
goto err;
}
--
2.45.2
