Skip to contentSkip to conversation

PM / Domains: remove unnecessary unlikely()

PATCH In review Yangtao Li 3 participants 3 messages Apr 16, 2019 – May 1, 2019

Subsystems (4)
lore
Share & tools
lore

Yangtao Li

author
#0 lore raw

PATCH 1/1 PM / Domains: remove unnecessary unlikely()

WARN_ON() already contains an unlikely(), so it's not necessary to use unlikely.

---
 drivers/base/power/domain.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/base/power/domain.c +2 -4
index 96a6dc9d305c..598a4e02aee1 100644
@@ -391,11 +391,9 @@ int dev_pm_genpd_set_performance_state(struct device *dev, unsigned int state)
 	if (unlikely(!genpd->set_performance_state))
 		return -EINVAL;
 
-	if (unlikely(!dev->power.subsys_data ||
-		     !dev->power.subsys_data->domain_data)) {
-		WARN_ON(1);
+	if (WARN_ON(!dev->power.subsys_data ||
+		     !dev->power.subsys_data->domain_data))
 		return -EINVAL;
-	}
 
 	genpd_lock(genpd);
 
Signature · 1 line
2.17.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Yangtao Li

WARN_ON() already contains an unlikely(), so it's not necessary to use unlikely.

Kind regards
Uffe

Quoted 25 lines
---
 drivers/base/power/domain.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/base/power/domain.c +2 -5
index 96a6dc9d305c..598a4e02aee1 100644
@@ -391,11 +391,9 @@ int dev_pm_genpd_set_performance_state(struct device *dev, unsigned int state)
        if (unlikely(!genpd->set_performance_state))
                return -EINVAL;
 
-       if (unlikely(!dev->power.subsys_data ||
-                    !dev->power.subsys_data->domain_data)) {
-               WARN_ON(1);
+       if (WARN_ON(!dev->power.subsys_data ||
+                    !dev->power.subsys_data->domain_data))
                return -EINVAL;
-       }
 
        genpd_lock(genpd);
 
--

2.17.0

#2 lore raw
Quoted 32 lines · CEST Ulf Hansson
Quoted 5 lines · Yangtao Li

WARN_ON() already contains an unlikely(), so it's not necessary to use unlikely.

Kind regards
Uffe

Quoted 20 lines
---
 drivers/base/power/domain.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/base/power/domain.c +2 -4
index 96a6dc9d305c..598a4e02aee1 100644
@@ -391,11 +391,9 @@ int dev_pm_genpd_set_performance_state(struct device *dev, unsigned int state)
        if (unlikely(!genpd->set_performance_state))
                return -EINVAL;
 
-       if (unlikely(!dev->power.subsys_data ||
-                    !dev->power.subsys_data->domain_data)) {
-               WARN_ON(1);
+       if (WARN_ON(!dev->power.subsys_data ||
+                    !dev->power.subsys_data->domain_data))
                return -EINVAL;
-       }
 
Quoted 6 lines
Quoted 5 lines
drivers/base/power/domain.c +0 -1
        genpd_lock(genpd);
 
--

2.17.0

Patch applied, thanks!