From patchwork Thu Oct 12 23:14:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 825108 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yCk7v485Vz9s7p for ; Fri, 13 Oct 2017 08:12:26 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 10E57C21F78; Thu, 12 Oct 2017 21:12:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C6099C21EEF; Thu, 12 Oct 2017 21:12:14 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CAB65C21EEF; Thu, 12 Oct 2017 21:12:13 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lists.denx.de (Postfix) with ESMTPS id 7790BC21C4F for ; Thu, 12 Oct 2017 21:12:13 +0000 (UTC) Received: from workstation4.fritz.box ([94.114.42.150]) by mail.gmx.com (mrgmx001 [212.227.17.184]) with ESMTPSA (Nemesis) id 0M1Wcz-1d9Gfg22WH-00tPU7; Thu, 12 Oct 2017 23:12:09 +0200 From: Heinrich Schuchardt To: Michal Simek , Albert Aribaud Date: Fri, 13 Oct 2017 01:14:27 +0200 Message-Id: <20171012231427.3627-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.14.1 X-Provags-ID: V03:K0:fRaaVkKXT8cLuXVEhg604GYGyRR205FW92CB7StNDlB/+uSDNYh +/UTT2oIrHRjuG7ZeIBIl0X1mOw3Qx1J8OMHjyUbor1y2+HVfHkI3vQk7D7QDkL/I0nb1EX 0HbQkzMug5PLgkgPU5kAXRBzsyh5efnROfJsPAWd6a6t+uTYDzfbICbGHuBR8fm7W0Cqkhx fJSFsierfzGtrH5VHkeiQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:qbGuEf4E9VA=:gdtv97V0BmfjlocObQL3Gc a4sMHrmnaiSDCcGE4smKTQx04ygS1Evgp3PrQdljJ6QLn8CMQGmM1pDFY9lyQjdGmNeKx8fiN +TD32oaLU5p+At6xfQqjKuQ/5vUl7bbrDICqZStm6VoiZR4tbXvRm2G8J4WNcHiyl6rb6EiKj z359/FPT+qj5Kk5Ab4c/iWCdEtxTkfOxwZZ5JiZH9RmFhhCp0Ig/UU+0TBr92hTrd3O5Qxiyt OWiiKBz1dYM/SG8mtbIiKvmwN0AKCmQyYzYRnUPMX423rAvt6p8S8MNBURdDSRZFgHZ4GqiW7 k41Wmzk4SYFzJZwQp6CmGMeQ6W0DJN5tut6KDf+u/fl2UGcggz8pT3wD54Q3dwwI2yKcFraB7 7YCOu+prDn1w6vwyMlSL5fjOs3jpNn2N+plrKwofh96jNpQjgGJx6s6a/zU0Y/Fkt1yGfxF0g vlrc5Urj9n3vxn5Yf2E1FvPAg+idToRHS7oUp3C7w+gjAZfc/LiG5r1NKPMOMsdc/0I1ISeKe mzNs69851vz1sv3vv8bjKNPeF987lNK5M3LQVoO61iO35zGNH2FJGx9bC87X4QdlKvyIZ8D1T BqFvTE0puCl7MCBUwI5d+OHTIzThM3vbll8tcp60D/oispYTdvxbC/7+o/GKcXt0HlD1ceYPf e+Fcka5xqBoyz5zAL686d6brJQzpy/1Kj8jiWvPVRkrX9SquTM6gZ4jhpaNHy7/9eqJehHv+Q otjtpfz2AG+fyd1U+MB5rcVqkAe/cGwouUxwGqASkFlwdG3bCRJxlrddw1xeMiLrjGOt81L9U 89nmi0TGaDvf5kLEDCo97JGeTMvbQ== Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [U-Boot] [PATCH 1/1] arm64: zynqmp: remove unnecessary logical constraint X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" In if (a || b) else if (!a) the constraint (!a) is always true if else is reached and can be removed. Signed-off-by: Heinrich Schuchardt --- arch/arm/cpu/armv8/zynqmp/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv8/zynqmp/cpu.c b/arch/arm/cpu/armv8/zynqmp/cpu.c index 1b5066a826..9b83e51885 100644 --- a/arch/arm/cpu/armv8/zynqmp/cpu.c +++ b/arch/arm/cpu/armv8/zynqmp/cpu.c @@ -198,7 +198,7 @@ int zynqmp_mmio_write(const u32 address, { if (IS_ENABLED(CONFIG_SPL_BUILD) || current_el() == 3) return zynqmp_mmio_rawwrite(address, mask, value); - else if (!IS_ENABLED(CONFIG_SPL_BUILD)) + else return invoke_smc(ZYNQMP_MMIO_WRITE, address, mask, value, 0, NULL); @@ -215,7 +215,7 @@ int zynqmp_mmio_read(const u32 address, u32 *value) if (IS_ENABLED(CONFIG_SPL_BUILD) || current_el() == 3) { ret = zynqmp_mmio_rawread(address, value); - } else if (!IS_ENABLED(CONFIG_SPL_BUILD)) { + } else { ret = invoke_smc(ZYNQMP_MMIO_READ, address, 0, 0, 0, ret_payload); *value = ret_payload[1];