lkml.org 
[lkml]   [2019]   [May]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] PM / Domains: remove unnecessary unlikely()
Date
On Wednesday, April 17, 2019 10:38:14 AM CEST Ulf Hansson wrote:
> On Tue, 16 Apr 2019 at 18:23, Yangtao Li <tiny.windzz@gmail.com> wrote:
> >
> > 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>
>
> Kind regards
> Uffe
>
> > ---
> > drivers/base/power/domain.c | 6 ++----
> > 1 file changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
> > index 96a6dc9d305c..598a4e02aee1 100644
> > --- a/drivers/base/power/domain.c
> > +++ b/drivers/base/power/domain.c
> > @@ -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);
> >
> > --
> > 2.17.0
> >
>

Patch applied, thanks!



\
 
 \ /
  Last update: 2019-05-01 12:25    [W:0.046 / U:0.192 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site