On Tue, 16 Apr 2019 at 18:23, Yangtao Li <[email protected]> wrote: > > WARN_ON() already contains an unlikely(), so it's not necessary to use > unlikely. > > Signed-off-by: Yangtao Li <[email protected]>
Reviewed-by: Ulf Hansson <[email protected]> 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 >
