Re: [PATCH] cpufreq: remove unnecessary unlikely()

From: Rafael J. Wysocki
Date: Fri Sep 14 2018 - 04:34:00 EST


On Friday, September 7, 2018 6:09:55 PM CEST Igor Stoppa wrote:
> WARN_ON() already contains an unlikely(), so it's not necessary to wrap it
> into another.
>
> Signed-off-by: Igor Stoppa <igor.stoppa@xxxxxxxxxx>
> Cc: Srivatsa S. Bhat <srivatsa.bhat@xxxxxxxxxxxxxxxxxx>
> Cc: "Rafael J. Wysocki" <rjw@xxxxxxxxxxxxx>
> Cc: linux-pm@xxxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> ---
> drivers/cpufreq/cpufreq.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
> index f53fb41efb7b..7aa3dcad2175 100644
> --- a/drivers/cpufreq/cpufreq.c
> +++ b/drivers/cpufreq/cpufreq.c
> @@ -403,7 +403,7 @@ EXPORT_SYMBOL_GPL(cpufreq_freq_transition_begin);
> void cpufreq_freq_transition_end(struct cpufreq_policy *policy,
> struct cpufreq_freqs *freqs, int transition_failed)
> {
> - if (unlikely(WARN_ON(!policy->transition_ongoing)))
> + if (WARN_ON(!policy->transition_ongoing))
> return;
>
> cpufreq_notify_post_transition(policy, freqs, transition_failed);
>

Applied, thanks!