From patchwork Wed Nov 26 09:18:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Lambert X-Patchwork-Id: 415022 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id CF20514017A for ; Wed, 26 Nov 2014 20:15:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752257AbaKZJOw (ORCPT ); Wed, 26 Nov 2014 04:14:52 -0500 Received: from mail-wi0-f177.google.com ([209.85.212.177]:43601 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750879AbaKZJOt (ORCPT ); Wed, 26 Nov 2014 04:14:49 -0500 Received: by mail-wi0-f177.google.com with SMTP id l15so4193899wiw.16 for ; Wed, 26 Nov 2014 01:14:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=NtAU8rfgRa4qD7ZV/pl5Bdnw+5n/vWd1eZX2g+NUN5E=; b=kDx7tMe9X9IuF7uMeXng9eyCc/3/st4qwd5C3Tdsm5AMDLibAi0aRwpVVMaVg8AtHT qYH4dq8H+I8EK3LHxcWxWZqxFhePhriAs65sdJpVoMLw4FTkgsY3o49ViZ89+EYc3CSg SJ3M7pihGNVsP/4mwSBuoqSAgSXau6u+GWOGvxqdhyz6PnM+FpQSP86MWgnDKdRGyhFL KPCglWeW1MYe2kiYIL8ylkIL1gdMtnGC7w1yP/IlfkoaBz+nBn/ZD3hhdf4D/XRXFmNO o+9r8/UHbCPf4Jb2mC/JUtiLIrpvgXu5MiyFc5yGlSjqP+MDXYsljNl6To8TR/qRXL7q 6f6Q== X-Received: by 10.180.98.100 with SMTP id eh4mr6027071wib.54.1416993288571; Wed, 26 Nov 2014 01:14:48 -0800 (PST) Received: from localhost.localdomain (asus-quentin.rsr.lip6.fr. [132.227.76.55]) by mx.google.com with ESMTPSA id l3sm5504386wje.12.2014.11.26.01.14.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Nov 2014 01:14:47 -0800 (PST) From: Quentin Lambert To: "David S. Miller" Cc: Quentin Lambert , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] x86: bpf_jit_comp: simplify trivial boolean return Date: Wed, 26 Nov 2014 10:18:17 +0100 Message-Id: <1416993497-27225-1-git-send-email-lambert.quentin@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove if then else statements preceding boolean return. Occurences were found using Coccinelle. The semantic patch used was: @@ expression expr; @@ - if ( expr ) - return true; - else - return false; + return expr; Signed-off-by: Quentin Lambert --- arch/x86/net/bpf_jit_comp.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index 3f62734..1542f39 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c @@ -135,11 +135,9 @@ static const int reg2hex[] = { */ static inline bool is_ereg(u32 reg) { - if (reg == BPF_REG_5 || reg == AUX_REG || - (reg >= BPF_REG_7 && reg <= BPF_REG_9)) - return true; - else - return false; + return (reg == BPF_REG_5 || + reg == AUX_REG || + (reg >= BPF_REG_7 && reg <= BPF_REG_9)); } /* add modifiers if 'reg' maps to x64 registers r8..r15 */