diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-04-24 18:36:07 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-04-24 18:36:07 +0200 |
| commit | 21def611d82976a1dca8c29b800194f29e013151 (patch) | |
| tree | 7862f0e910bd469b56b752017aa6c6cf3a09fdb7 | |
| parent | Merge branch 'pm-cpufreq' (diff) | |
| parent | cpuidle: Use of_property_present() for testing DT property presence (diff) | |
| download | wireguard-linux-21def611d82976a1dca8c29b800194f29e013151.tar.xz wireguard-linux-21def611d82976a1dca8c29b800194f29e013151.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | drivers/cpuidle/cpuidle-psci-domain.c | 2 | ||||
| -rw-r--r-- | drivers/cpuidle/cpuidle-riscv-sbi.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/cpuidle/cpuidle-psci-domain.c b/drivers/cpuidle/cpuidle-psci-domain.c index 11316c3b14ca..c2d6d9c3c930 100644 --- a/drivers/cpuidle/cpuidle-psci-domain.c +++ b/drivers/cpuidle/cpuidle-psci-domain.c @@ -166,7 +166,7 @@ static int psci_cpuidle_domain_probe(struct platform_device *pdev) * 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 = psci_pd_init(node, use_osi); diff --git a/drivers/cpuidle/cpuidle-riscv-sbi.c b/drivers/cpuidle/cpuidle-riscv-sbi.c index be383f4b6855..1fab1abc6eb6 100644 --- 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; |