* [PATCH] PM / Domains: remove unnecessary unlikely()
@ 2019-04-16 16:23 Yangtao Li
2019-04-17 8:38 ` Ulf Hansson
0 siblings, 1 reply; 3+ messages in thread
From: Yangtao Li @ 2019-04-16 16:23 UTC (permalink / raw)
To: rjw, khilman, ulf.hansson, pavel, len.brown, gregkh
Cc: linux-pm, linux-kernel, Yangtao Li
WARN_ON() already contains an unlikely(), so it's not necessary to use
unlikely.
Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] PM / Domains: remove unnecessary unlikely()
2019-04-16 16:23 [PATCH] PM / Domains: remove unnecessary unlikely() Yangtao Li
@ 2019-04-17 8:38 ` Ulf Hansson
2019-05-01 10:24 ` Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Ulf Hansson @ 2019-04-17 8:38 UTC (permalink / raw)
To: Yangtao Li
Cc: Rafael J. Wysocki, Kevin Hilman, Pavel Machek, Len Brown,
Greg Kroah-Hartman, Linux PM, Linux Kernel Mailing List
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] PM / Domains: remove unnecessary unlikely()
2019-04-17 8:38 ` Ulf Hansson
@ 2019-05-01 10:24 ` Rafael J. Wysocki
0 siblings, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2019-05-01 10:24 UTC (permalink / raw)
To: Ulf Hansson, Yangtao Li
Cc: Kevin Hilman, Pavel Machek, Len Brown, Greg Kroah-Hartman,
Linux PM, Linux Kernel Mailing List
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!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-01 10:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-16 16:23 [PATCH] PM / Domains: remove unnecessary unlikely() Yangtao Li
2019-04-17 8:38 ` Ulf Hansson
2019-05-01 10:24 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox