| Message ID | 20250417142513.312939-3-ulf.hansson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | pmdomain: Add generic ->sync_state() support to genpd | expand |
On 25-04-17 16:25:00, Ulf Hansson wrote: > Rather than using two if-clauses immediately after each to check for > similar reasons to prevent the power-off, let's combine them into one > if-clause to simplify the code. > > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Reviewed-by: Abel Vesa <abel.vesa@linaro.org> > --- > drivers/pmdomain/core.c | 20 +++++++------------- > 1 file changed, 7 insertions(+), 13 deletions(-) > > diff --git a/drivers/pmdomain/core.c b/drivers/pmdomain/core.c > index 574a0de1696a..34a85bf347ad 100644 > --- a/drivers/pmdomain/core.c > +++ b/drivers/pmdomain/core.c > @@ -917,20 +917,14 @@ static void genpd_power_off(struct generic_pm_domain *genpd, bool one_dev_on, > > /* > * Do not try to power off the domain in the following situations: > - * (1) The domain is already in the "power off" state. > - * (2) System suspend is in progress. > + * The domain is already in the "power off" state. > + * System suspend is in progress. > + * The domain is configured as always on. > + * The domain has a subdomain being powered on. > */ > - if (!genpd_status_on(genpd) || genpd->prepared_count > 0) > - return; > - > - /* > - * Abort power off for the PM domain in the following situations: > - * (1) The domain is configured as always on. > - * (2) When the domain has a subdomain being powered on. > - */ > - if (genpd_is_always_on(genpd) || > - genpd_is_rpm_always_on(genpd) || > - atomic_read(&genpd->sd_count) > 0) > + if (!genpd_status_on(genpd) || genpd->prepared_count > 0 || > + genpd_is_always_on(genpd) || genpd_is_rpm_always_on(genpd) || > + atomic_read(&genpd->sd_count) > 0) > return; > > /* > -- > 2.43.0 >
diff --git a/drivers/pmdomain/core.c b/drivers/pmdomain/core.c index 574a0de1696a..34a85bf347ad 100644 --- a/drivers/pmdomain/core.c +++ b/drivers/pmdomain/core.c @@ -917,20 +917,14 @@ static void genpd_power_off(struct generic_pm_domain *genpd, bool one_dev_on, /* * Do not try to power off the domain in the following situations: - * (1) The domain is already in the "power off" state. - * (2) System suspend is in progress. + * The domain is already in the "power off" state. + * System suspend is in progress. + * The domain is configured as always on. + * The domain has a subdomain being powered on. */ - if (!genpd_status_on(genpd) || genpd->prepared_count > 0) - return; - - /* - * Abort power off for the PM domain in the following situations: - * (1) The domain is configured as always on. - * (2) When the domain has a subdomain being powered on. - */ - if (genpd_is_always_on(genpd) || - genpd_is_rpm_always_on(genpd) || - atomic_read(&genpd->sd_count) > 0) + if (!genpd_status_on(genpd) || genpd->prepared_count > 0 || + genpd_is_always_on(genpd) || genpd_is_rpm_always_on(genpd) || + atomic_read(&genpd->sd_count) > 0) return; /*
Rather than using two if-clauses immediately after each to check for similar reasons to prevent the power-off, let's combine them into one if-clause to simplify the code. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/pmdomain/core.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)