From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.9518.1582101474065216575 for ; Wed, 19 Feb 2020 00:37:54 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: vijayenthiran.subramaniam@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B5E431FB; Wed, 19 Feb 2020 00:37:53 -0800 (PST) Received: from usa.arm.com (a074939-lin.blr.arm.com [10.162.16.84]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D94AD3F68F; Wed, 19 Feb 2020 00:37:51 -0800 (PST) From: "Vijayenthiran Subramaniam" To: devel@edk2.groups.io, leif@nuviainc.com, michael.d.kinney@intel.com, Ard.Biesheuvel@arm.com Cc: thomas.abraham@arm.com Subject: [edk2-platforms] [PATCH v2] Platform/ARM/SgiPkg: Fix constant-logical-operand clang error Date: Wed, 19 Feb 2020 14:07:47 +0530 Message-Id: <1582101467-14146-1-git-send-email-vijayenthiran.subramaniam@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1582100458-13080-1-git-send-email-vijayenthiran.subramaniam@arm.com> References: <1582100458-13080-1-git-send-email-vijayenthiran.subramaniam@arm.com> Fix "use of logical '&&' with constant operand" error when built with CLANG38 toolchain. Signed-off-by: Vijayenthiran Subramaniam --- Changes since v1: - Fix Copyright year Notes: Fix Clan error reported by Leif in https://edk2.groups.io/g/devel/message/54586. Build tested with clang 9: CLANG38_AARCH64_PREFIX=aarch64-linux-gnu- build -n $NUM_CPUS -a AARCH64 \ -t CLANG38 -p Platform/ARM/SgiPkg/SgiPlatform.dsc Platform/ARM/SgiPkg/Drivers/PlatformDxe/VirtioDevices.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/VirtioDevices.c b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/VirtioDevices.c index 9e5f7e704e24..f91724b95a42 100644 --- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/VirtioDevices.c +++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/VirtioDevices.c @@ -1,6 +1,6 @@ /** @file - Copyright (c) 2018, ARM Ltd. All rights reserved.
+ Copyright (c) 2018-2020, ARM Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @@ -81,8 +81,8 @@ InitVirtioDevices ( STATIC EFI_HANDLE mVirtIoNetController = NULL; // Install protocol interface for storage device - if ((FeaturePcdGet (PcdVirtioBlkSupported)) && - (FixedPcdGet32 (PcdVirtioBlkBaseAddress))) { + if ((FeaturePcdGet (PcdVirtioBlkSupported) == TRUE) && + (FixedPcdGet32 (PcdVirtioBlkBaseAddress) != 0)) { Status = gBS->InstallProtocolInterface (&mVirtIoBlkController, &gEfiDevicePathProtocolGuid, EFI_NATIVE_INTERFACE, &mVirtioBlockDevicePath); @@ -110,8 +110,8 @@ InitVirtioDevices ( } // Install protocol interface for network device - if ((FeaturePcdGet (PcdVirtioNetSupported)) && - (FixedPcdGet32 (PcdVirtioNetBaseAddress))) { + if ((FeaturePcdGet (PcdVirtioNetSupported) == TRUE) && + (FixedPcdGet32 (PcdVirtioNetBaseAddress) != 0)) { Status = gBS->InstallProtocolInterface (&mVirtIoNetController, &gEfiDevicePathProtocolGuid, EFI_NATIVE_INTERFACE, &mVirtioNetDevicePath); -- 2.7.4