From patchwork Wed Nov 16 15:20:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101509 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp211683qge; Wed, 16 Nov 2016 07:21:25 -0800 (PST) X-Received: by 10.99.125.77 with SMTP id m13mr9489376pgn.58.1479309684964; Wed, 16 Nov 2016 07:21:24 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p85si32293991pfj.243.2016.11.16.07.21.24; Wed, 16 Nov 2016 07:21:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934307AbcKPPVU (ORCPT + 26 others); Wed, 16 Nov 2016 10:21:20 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:63900 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932166AbcKPPVT (ORCPT ); Wed, 16 Nov 2016 10:21:19 -0500 Received: from wuerfel.lan ([78.43.21.235]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0MHci0-1c3jAL25jY-003KMZ; Wed, 16 Nov 2016 16:20:49 +0100 From: Arnd Bergmann To: Linus Walleij Cc: Daniel Lezcano , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: ux500: fix prcmu_is_cpu_in_wfi() calculation Date: Wed, 16 Nov 2016 16:20:37 +0100 Message-Id: <20161116152047.3336967-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:KdOwFUBre3H8+UaDF5BJgIJC4VQoVaTrgzX4purwNOjjo27K87G p6d/gpm3BzIUVN4YkHAUeuoHxhficsaNHRj+sVW3I4OlrJ6aXVHiF5mkW59UOkQdK6qqI7R Jcdn18e+NG64qyJ2k6vQTsLfjomQWjU6MhHcxZdRL1lsnPhvOzhNiDmq7n163sJrk+U4G32 wpcwjZo/R5zoomtF50/Jw== X-UI-Out-Filterresults: notjunk:1; V01:K0:rNuBorJeLPo=:SYY0Uktw/5aok20s2EGFs6 nebpdJXk61Inf9KJjreSjZb19LbCOOOy6KCJxBJ6UaeEe4woHbQzpNF8vhWDIs8KRus/4WN1n uWgdtaRURzx51wD5/YzFgyP6ulrdbB6wxKdIgEIV+mgKXbYlX//XKsH7YBay42gHmeovCeq9s VxGoDvkejuBa1hR8bq2moR2qZXNx1gmgOIoD3syCB78ZEcc9ScM32K3VfEoWDDUcnTJUrlLBl qHVcbxNX7QUGdzAUG3lTrk7Zzy5Km3FZZBSKHnCpv+lgfUyvXzaTpuLt1bY2M34GvIYYDWClY 9L+COcDtbeVZW28cEuZe4JRm1mNAU3enG6sgSEMTBr9URlrAg9gilEQsdF2IauFgopOh6ZjW7 hPTA4/Thtf91yoLz/enuWzF+qGGZeo0KjMRJl0NF7h+vhjV3EFTEChDZIOUlcaOgxTi+Zfe7/ 3DuhRgPu7y0KG3zXAbicO/G/6hjDOV7CrCeTTQb71+e+LbUgLiNl9o0Td0bNSVvozchBhnIWi ttrdUUVpZnSddtEVq8sfygYrOc+M4KKveKqjVwAj17zUvjQ4NuuEtB1/PoI7zpNfQHdjl/Ao4 4dRec/E3zMgQ0cMa6DtXHstNau1s13BZwsGqXyu5AButacHD0jxalzrbVR5eAkttupdkwG2w1 op81jDzjmMWy/yCnsPEccPRWpzG9+qCOSNkhMuy7mQuo7A743BUXMF2gZctfh3ZmBeGQ= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This function clearly never worked and always returns true, as pointed out by gcc-7: arch/arm/mach-ux500/pm.c: In function 'prcmu_is_cpu_in_wfi': arch/arm/mach-ux500/pm.c:137:212: error: ?: using integer constants in boolean context, the expression will always evaluate to 'true' [-Werror=int-in-bool-context] With the added braces, the condition actually makes sense. Fixes: 34fe6f107eab ("mfd : Check if the other db8500 core is in WFI") Signed-off-by: Arnd Bergmann --- arch/arm/mach-ux500/pm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c index 8538910db202..a970e7fcba9e 100644 --- a/arch/arm/mach-ux500/pm.c +++ b/arch/arm/mach-ux500/pm.c @@ -134,8 +134,8 @@ bool prcmu_pending_irq(void) */ bool prcmu_is_cpu_in_wfi(int cpu) { - return readl(PRCM_ARM_WFI_STANDBY) & cpu ? PRCM_ARM_WFI_STANDBY_WFI1 : - PRCM_ARM_WFI_STANDBY_WFI0; + return readl(PRCM_ARM_WFI_STANDBY) & + (cpu ? PRCM_ARM_WFI_STANDBY_WFI1 : PRCM_ARM_WFI_STANDBY_WFI0); } /*