Skip to content

Commit 21def61

Browse files
committed
Merge branch 'pm-cpuidle'
Merge a cpuidle change for 6.4-rc1: - Use of_property_present() for testing DT property presence in the cpuidle code (Rob Herring). * pm-cpuidle: cpuidle: Use of_property_present() for testing DT property presence
2 parents 640324e + f914bfd commit 21def61

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/cpuidle/cpuidle-psci-domain.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ static int psci_cpuidle_domain_probe(struct platform_device *pdev)
166166
* initialize a genpd/genpd-of-provider pair when it's found.
167167
*/
168168
for_each_child_of_node(np, node) {
169-
if (!of_find_property(node, "#power-domain-cells", NULL))
169+
if (!of_property_present(node, "#power-domain-cells"))
170170
continue;
171171

172172
ret = psci_pd_init(node, use_osi);

drivers/cpuidle/cpuidle-riscv-sbi.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ static int sbi_genpd_probe(struct device_node *np)
497497
* initialize a genpd/genpd-of-provider pair when it's found.
498498
*/
499499
for_each_child_of_node(np, node) {
500-
if (!of_find_property(node, "#power-domain-cells", NULL))
500+
if (!of_property_present(node, "#power-domain-cells"))
501501
continue;
502502

503503
ret = sbi_pd_init(node);
@@ -548,8 +548,8 @@ static int sbi_cpuidle_probe(struct platform_device *pdev)
548548
for_each_possible_cpu(cpu) {
549549
np = of_cpu_device_node_get(cpu);
550550
if (np &&
551-
of_find_property(np, "power-domains", NULL) &&
552-
of_find_property(np, "power-domain-names", NULL)) {
551+
of_property_present(np, "power-domains") &&
552+
of_property_present(np, "power-domain-names")) {
553553
continue;
554554
} else {
555555
sbi_cpuidle_use_osi = false;

0 commit comments

Comments
 (0)