summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev
diff options
context:
space:
mode:
authorIgor Stoppa <igor.stoppa@gmail.com>2018-09-07 17:35:26 +0200
committerMichael Ellerman <mpe@ellerman.id.au>2019-01-15 01:38:05 +0100
commit63da6caeb84cfad3d1e5774b7049dd1d2c9dec62 (patch)
tree6a129acf94fc9d19cc0d76b329205718fd58d204 /arch/powerpc/sysdev
parentpowerpc: Allow CPU selection of G4/74xx variant (diff)
downloadlinux-63da6caeb84cfad3d1e5774b7049dd1d2c9dec62.tar.xz
linux-63da6caeb84cfad3d1e5774b7049dd1d2c9dec62.zip
powerpc: remove unnecessary unlikely()
WARN_ON() already contains an unlikely(), so it's not necessary to wrap it into another. Signed-off-by: Igor Stoppa <igor.stoppa@huawei.com> Cc: Arseny Solokha <asolokha@kb.kras.ru> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/sysdev')
-rw-r--r--arch/powerpc/sysdev/xive/common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/xive/common.c b/arch/powerpc/sysdev/xive/common.c
index 94a69a62f5db..70a8f9e31a2d 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;
}