Skip to contentSkip to conversation

PM: domains: Simplify the calculation of variables

PATCH Applied Abaci Team 3 participants 3 messages Jan 27, 2021 – Feb 1, 2021

Subsystems (4)
lore
Share & tools
lore

Abaci Team

author
#0 lore raw

PATCH 1/1 PM: domains: Simplify the calculation of variables

Fix the following coccicheck warnings:

./drivers/base/power/domain.c:938:31-33: WARNING !A || A && B is equivalent to !A || B.

---
 drivers/base/power/domain.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/base/power/domain.c +1 -2
index 9a14eed..e689710 100644
@@ -934,8 +934,7 @@ static int genpd_runtime_resume(struct device *dev)
 err_stop:
 	genpd_stop_dev(genpd, dev);
 err_poweroff:
-	if (!pm_runtime_is_irq_safe(dev) ||
-		(pm_runtime_is_irq_safe(dev) && genpd_is_irq_safe(genpd))) {
+	if (!pm_runtime_is_irq_safe(dev) || genpd_is_irq_safe(genpd)) {
 		genpd_lock(genpd);
 		genpd_power_off(genpd, true, 0);
 		genpd_unlock(genpd);
Signature · 1 line
1.8.3.1
Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · Abaci Team

Fix the following coccicheck warnings:

./drivers/base/power/domain.c:938:31-33: WARNING !A || A && B is equivalent to !A || B.

Kind regards
Uffe

Quoted 21 lines
---
 drivers/base/power/domain.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/base/power/domain.c +1 -3
index 9a14eed..e689710 100644
@@ -934,8 +934,7 @@ static int genpd_runtime_resume(struct device *dev)
 err_stop:
        genpd_stop_dev(genpd, dev);
 err_poweroff:
-       if (!pm_runtime_is_irq_safe(dev) ||
-               (pm_runtime_is_irq_safe(dev) && genpd_is_irq_safe(genpd))) {
+       if (!pm_runtime_is_irq_safe(dev) || genpd_is_irq_safe(genpd)) {
                genpd_lock(genpd);
                genpd_power_off(genpd, true, 0);
                genpd_unlock(genpd);
--

1.8.3.1

maintainer Applied
#2 lore raw
Quoted 5 lines · Ulf Hansson
Quoted 3 lines · Abaci Team

Fix the following coccicheck warnings:

Quoted 8 lines
Quoted 6 lines

./drivers/base/power/domain.c:938:31-33: WARNING !A || A && B is equivalent to !A || B.

Applied as 5.12 material, thanks!

Quoted 21 lines
Quoted 21 lines
---
 drivers/base/power/domain.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/base/power/domain.c +1 -3
index 9a14eed..e689710 100644
@@ -934,8 +934,7 @@ static int genpd_runtime_resume(struct device *dev)
 err_stop:
        genpd_stop_dev(genpd, dev);
 err_poweroff:
-       if (!pm_runtime_is_irq_safe(dev) ||
-               (pm_runtime_is_irq_safe(dev) && genpd_is_irq_safe(genpd))) {
+       if (!pm_runtime_is_irq_safe(dev) || genpd_is_irq_safe(genpd)) {
                genpd_lock(genpd);
                genpd_power_off(genpd, true, 0);
                genpd_unlock(genpd);
--

1.8.3.1