Merge tag 'devicetree-for-6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / drivers / cpuidle / cpuidle-riscv-sbi.c

diff --git a/drivers/cpuidle/cpuidle-riscv-sbi.c b/drivers/cpuidle/cpuidle-riscv-sbi.c
index ae0b838a06340b7d4286e72ff5c89ec904067c07..f2ccda2c38711c5fcc339b2ac49b56b047e4b4db 100644 (file)
--- a/drivers/cpuidle/cpuidle-riscv-sbi.c
+++ b/drivers/cpuidle/cpuidle-riscv-sbi.c
@@ -497,7 +497,7 @@ static int sbi_genpd_probe(struct device_node *np)
         * initialize a genpd/genpd-of-provider pair when it's found.
         */
        for_each_child_of_node(np, node) {
-               if (!of_find_property(node, "#power-domain-cells", NULL))
+               if (!of_property_present(node, "#power-domain-cells"))
                        continue;
 
                ret = sbi_pd_init(node);
@@ -548,8 +548,8 @@ static int sbi_cpuidle_probe(struct platform_device *pdev)
        for_each_possible_cpu(cpu) {
                np = of_cpu_device_node_get(cpu);
                if (np &&
-                   of_find_property(np, "power-domains", NULL) &&
-                   of_find_property(np, "power-domain-names", NULL)) {
+                   of_property_present(np, "power-domains") &&
+                   of_property_present(np, "power-domain-names")) {
                        continue;
                } else {
                        sbi_cpuidle_use_osi = false;