* [PATCH v2 1/4] PM / Domains: Allow no domain-idle-states DT property in genpd when parsing
[not found] <20200303203559.23995-1-ulf.hansson@linaro.org>
@ 2020-03-03 20:35 ` Ulf Hansson
2020-03-04 10:48 ` Sudeep Holla
0 siblings, 1 reply; 2+ messages in thread
From: Ulf Hansson @ 2020-03-03 20:35 UTC (permalink / raw)
To: Sudeep Holla, Lorenzo Pieralisi, linux-pm
Cc: Rafael J . Wysocki, Daniel Lezcano, Lina Iyer, Vincent Guittot,
Stephen Boyd, Bjorn Andersson, Benjamin Gaignard, Ulf Hansson,
linux-arm-kernel, stable
Commit 2c361684803e ("PM / Domains: Don't treat zero found compatible idle
states as an error"), moved of_genpd_parse_idle_states() towards allowing
none compatible idle state to be found for the device node, rather than
returning an error code.
However, it didn't consider that the "domain-idle-states" DT property may
be missing as it's optional, which makes of_count_phandle_with_args() to
return -ENOENT. Let's fix this to make the behaviour consistent.
Reported-by: Benjamin Gaignard <benjamin.gaignard@st.com>
Fixes: 2c361684803e ("PM / Domains: Don't treat zero found compatible idle states as an error")
Cc: <stable@vger.kernel.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
drivers/base/power/domain.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 959d6d5eb000..0a01df608849 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -2653,7 +2653,7 @@ static int genpd_iterate_idle_states(struct device_node *dn,
ret = of_count_phandle_with_args(dn, "domain-idle-states", NULL);
if (ret <= 0)
- return ret;
+ return ret == -ENOENT ? 0 : ret;
/* Loop over the phandles until all the requested entry is found */
of_for_each_phandle(&it, ret, dn, "domain-idle-states", NULL, 0) {
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread