From: "Vijayenthiran Subramaniam" <vijayenthiran.subramaniam@arm.com>
To: devel@edk2.groups.io, leif@nuviainc.com, Ard.Biesheuvel@arm.com,
thomas.abraham@arm.com
Subject: [edk2-platforms] [PATCH v3] Platform/ARM/SgiPkg: Fix constant-logical-operand clang error
Date: Wed, 25 Nov 2020 20:00:30 +0530 [thread overview]
Message-ID: <1606314630-13316-1-git-send-email-vijayenthiran.subramaniam@arm.com> (raw)
Fix "use of logical '&&' with constant operand" error when built with
CLANG38 toolchain.
Reviewed-by: Thomas Abraham <thomas.abraham@arm.com>
Signed-off-by: Vijayenthiran Subramaniam <vijayenthiran.subramaniam@arm.com>
---
Changes since v2:
- Reviewed-bys added from:
https://edk2.groups.io/g/devel/topic/71391950#55868
- Rebased to latest master and repost.
Changes since v1:
- Fix Copyright year
Note:
Fix Clan error reported by Leif in
https://edk2.groups.io/g/devel/message/54586
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 9e5f7e70..f91724b9 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.<BR>
+ 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.17.1
next reply other threads:[~2020-11-25 14:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-25 14:30 Vijayenthiran Subramaniam [this message]
2020-11-25 15:04 ` [edk2-platforms] [PATCH v3] Platform/ARM/SgiPkg: Fix constant-logical-operand clang error Ard Biesheuvel
2020-11-26 13:21 ` [edk2-devel] " Vijayenthiran Subramaniam
2020-11-27 10:45 ` Vijayenthiran Subramaniam
2020-11-27 11:27 ` Ard Biesheuvel
2020-11-25 17:58 ` Leif Lindholm
2020-11-27 12:31 ` [edk2-devel] " Vijayenthiran Subramaniam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1606314630-13316-1-git-send-email-vijayenthiran.subramaniam@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox