github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 11:03:43 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'pm-cpuidle'

Browse Source 
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
This commit is contained in:
Rafael J. Wysocki 2023-04-24 18:36:07 +02:00
commit 21def611d8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/cpuidle/cpuidle-psci-domain.c
View File

@ -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);

6
drivers/cpuidle/cpuidle-riscv-sbi.c
View File

@ -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;