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 <[email protected]>
> Signed-off-by: Viresh Kumar <[email protected]>
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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
