[PATCH 22/23] powerpc: remove unnecessary unlikely()

[Igor Stoppa]

WARN_ON() already contains an unlikely(), so it's not necessary to
wrap it into another.

Signed-off-by: Igor Stoppa <igor.sto...@huawei.com>
Cc: Arseny Solokha <asolo...@kb.kras.ru>
Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Michael Ellerman <m...@ellerman.id.au>
---
 arch/powerpc/mm/tlb_nohash.c      | 2 +-
 arch/powerpc/sysdev/xive/common.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c
index 15fe5f0c8665..46f5d8c972fb 100644
--- a/arch/powerpc/mm/tlb_nohash.c
+++ b/arch/powerpc/mm/tlb_nohash.c
@@ -302,7 +302,7 @@ void __flush_tlb_page(struct mm_struct *mm, unsigned long 
vmaddr,
         * This function as well as __local_flush_tlb_page() must only be called
         * for user contexts.
         */
-       if (unlikely(WARN_ON(!mm)))
+       if (WARN_ON(!mm))
                return;
 
        preempt_disable();
diff --git a/arch/powerpc/sysdev/xive/common.c 
b/arch/powerpc/sysdev/xive/common.c
index 959a2a62f233..7dde46b38979 100644
--- a/arch/powerpc/sysdev/xive/common.c
+++ b/arch/powerpc/sysdev/xive/common.c
@@ -442,7 +442,7 @@ static void xive_dec_target_count(int cpu)
        struct xive_cpu *xc = per_cpu(xive_cpu, cpu);
        struct xive_q *q = &xc->queue[xive_irq_priority];
 
-       if (unlikely(WARN_ON(cpu < 0 || !xc))) {
+       if (WARN_ON(cpu < 0 || !xc)) {
                pr_err("%s: cpu=%d xc=%p\n", __func__, cpu, xc);
                return;
        }
-- 
2.17.1