lkml.org 
[lkml]   [2015]   [Aug]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH V1 Resend 02/10] PM / OPP: Drop unlikely before IS_ERR(_OR_NULL)
Date
On Wednesday, August 12, 2015 03:59:39 PM Viresh Kumar wrote:
> 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>

Did that go anywhere or should I apply it?

> ---
> drivers/base/power/opp.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c
> index 51b220e615d3..97c31170437d 100644
> --- a/drivers/base/power/opp.c
> +++ b/drivers/base/power/opp.c
> @@ -204,7 +204,7 @@ static struct device_opp *_find_device_opp(struct device *dev)
> {
> 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__);
> return ERR_PTR(-EINVAL);
> }
> @@ -239,7 +239,7 @@ unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp)
> opp_rcu_lockdep_assert();
>
> 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__);
> else
> 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();
>
> 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__);
> else
> f = tmp_opp->rate;
>

--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.


\
 
 \ /
  Last update: 2015-08-28 16:01    [W:0.155 / U:0.312 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site