Browse Source

PM / OPP: Drop unlikely before IS_ERR(_OR_NULL)

IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there
is no need to do that again from its callers. Drop it.

Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Viresh Kumar 10 years ago
parent
commit
50a3cb04a5
1 changed files with 3 additions and 3 deletions
  1. 3 3
      drivers/base/power/opp.c

+ 3 - 3
drivers/base/power/opp.c

@@ -204,7 +204,7 @@ static struct device_opp *_find_device_opp(struct device *dev)
 {
 {
 	struct device_opp *dev_opp;
 	struct device_opp *dev_opp;
 
 
-	if (unlikely(IS_ERR_OR_NULL(dev))) {
+	if (IS_ERR_OR_NULL(dev)) {
 		pr_err("%s: Invalid parameters\n", __func__);
 		pr_err("%s: Invalid parameters\n", __func__);
 		return ERR_PTR(-EINVAL);
 		return ERR_PTR(-EINVAL);
 	}
 	}
@@ -239,7 +239,7 @@ unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp)
 	opp_rcu_lockdep_assert();
 	opp_rcu_lockdep_assert();
 
 
 	tmp_opp = rcu_dereference(opp);
 	tmp_opp = rcu_dereference(opp);
-	if (unlikely(IS_ERR_OR_NULL(tmp_opp)) || !tmp_opp->available)
+	if (IS_ERR_OR_NULL(tmp_opp) || !tmp_opp->available)
 		pr_err("%s: Invalid parameters\n", __func__);
 		pr_err("%s: Invalid parameters\n", __func__);
 	else
 	else
 		v = tmp_opp->u_volt;
 		v = tmp_opp->u_volt;
@@ -271,7 +271,7 @@ unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp)
 	opp_rcu_lockdep_assert();
 	opp_rcu_lockdep_assert();
 
 
 	tmp_opp = rcu_dereference(opp);
 	tmp_opp = rcu_dereference(opp);
-	if (unlikely(IS_ERR_OR_NULL(tmp_opp)) || !tmp_opp->available)
+	if (IS_ERR_OR_NULL(tmp_opp) || !tmp_opp->available)
 		pr_err("%s: Invalid parameters\n", __func__);
 		pr_err("%s: Invalid parameters\n", __func__);
 	else
 	else
 		f = tmp_opp->rate;
 		f = tmp_opp->rate;