lkml.org 
[lkml]   [2015]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/15] PM / OPP: Drop unlikely before IS_ERR(_OR_NULL)
    Date
    IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there
    is no need to do that again from its callers. Drop it.

    Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
    ---
    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 677fb2843553..f60bdd5cbb71 100644
    --- a/drivers/base/power/opp.c
    +++ b/drivers/base/power/opp.c
    @@ -134,7 +134,7 @@ static struct device_opp *_find_device_opp(struct device *dev)
    {
    struct device_opp *tmp_dev_opp, *dev_opp = ERR_PTR(-ENODEV);

    - if (unlikely(IS_ERR_OR_NULL(dev))) {
    + if (IS_ERR_OR_NULL(dev)) {
    pr_err("%s: Invalid parameters\n", __func__);
    return ERR_PTR(-EINVAL);
    }
    @@ -172,7 +172,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;
    @@ -204,7 +204,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;
    --
    2.4.0


    \
     
     \ /
      Last update: 2015-07-31 11:01    [W:5.184 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site