PM / Domains: remove unnecessary unlikely()
authorYangtao Li <tiny.windzz@gmail.com>
Tue, 16 Apr 2019 16:23:05 +0000 (12:23 -0400)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Apr 2019 14:36:41 +0000 (16:36 +0200)
WARN_ON() already contains an unlikely(), so it's not necessary to use
unlikely.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/base/power/domain.c

index 96a6dc9..598a4e0 100644 (file)
@@ -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);