From patchwork Tue Jun 28 13:25:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 71081 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1584654qgy; Tue, 28 Jun 2016 06:26:01 -0700 (PDT) X-Received: by 10.98.208.197 with SMTP id p188mr1831690pfg.152.1467120361588; Tue, 28 Jun 2016 06:26:01 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id z25si6400155pff.218.2016.06.28.06.26.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jun 2016 06:26:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 7F34A1A1E2C; Tue, 28 Jun 2016 06:26:32 -0700 (PDT) X-Original-To: edk2-devel@ml01.01.org Delivered-To: edk2-devel@ml01.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B7B6B1A1E2B for ; Tue, 28 Jun 2016 06:26:30 -0700 (PDT) Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 61E6E4DB14; Tue, 28 Jun 2016 13:25:55 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-55.phx2.redhat.com [10.3.116.55]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5SDPfYb024563; Tue, 28 Jun 2016 09:25:54 -0400 From: Laszlo Ersek To: edk2-devel-01 Date: Tue, 28 Jun 2016 15:25:38 +0200 Message-Id: <1467120338-12587-7-git-send-email-lersek@redhat.com> In-Reply-To: <1467120338-12587-1-git-send-email-lersek@redhat.com> References: <1467120338-12587-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 28 Jun 2016 13:25:55 +0000 (UTC) Subject: [edk2] [PATCH 6/6] Vlv2TbltDevicePkg: fix ASSERT_EFI_ERROR() typos X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Tim He , David Wei MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" A number of code locations use ASSERT_EFI_ERROR (BooleanExpression) instead of ASSERT (BooleanExpression) Fix them. Cc: David Wei Cc: Tim He Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek --- Notes: not even build tested Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c | 6 +++--- Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c | 8 ++++---- Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) -- 1.8.3.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c index da7dce6e13c7..7c95c107e600 100644 --- a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c +++ b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c @@ -154,7 +154,7 @@ FvbGetVolumeAttributes ( { EFI_FW_VOL_INSTANCE * FwInstance = NULL; FwInstance = GetFvbInstance(Instance); - ASSERT_EFI_ERROR (FwInstance != NULL); + ASSERT (FwInstance != NULL); if ( FwInstance != NULL ) { return FwInstance->VolumeHeader.Attributes; @@ -208,7 +208,7 @@ FvbGetLbaAddress ( StartLba = 0; Offset = 0; BlockMap = &(FwhInstance->VolumeHeader.BlockMap[0]); - ASSERT_EFI_ERROR (BlockMap != NULL); + ASSERT (BlockMap != NULL); // // Parse the blockmap of the FV to find which map entry the Lba belongs to. @@ -512,7 +512,7 @@ FvbSetVolumeAttributes ( FwhInstance = GetFvbInstance (Instance); AttribPtr = (EFI_FVB_ATTRIBUTES_2 *) & (FwhInstance->VolumeHeader.Attributes); - ASSERT_EFI_ERROR (AttribPtr != NULL); + ASSERT (AttribPtr != NULL); if ( AttribPtr != NULL) { OldAttributes = *AttribPtr; diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c index e38633b2b3ae..7d740df2fef9 100644 --- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c +++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c @@ -69,10 +69,10 @@ ConfigureClockGenerator ( // // Verify input arguments // - ASSERT_EFI_ERROR (ConfigurationTableLength >= 6); - ASSERT_EFI_ERROR (ConfigurationTableLength <= MAX_CLOCK_GENERATOR_BUFFER_LENGTH); - ASSERT_EFI_ERROR (ClockType < ClockGeneratorMax); - ASSERT_EFI_ERROR (ConfigurationTable != NULL); + ASSERT (ConfigurationTableLength >= 6); + ASSERT (ConfigurationTableLength <= MAX_CLOCK_GENERATOR_BUFFER_LENGTH); + ASSERT (ClockType < ClockGeneratorMax); + ASSERT (ConfigurationTable != NULL); // // Read the clock generator diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c index ebaaf40a165e..9d77e86678fe 100644 --- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c +++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c @@ -49,7 +49,7 @@ GetPlatformInfoHob ( // // PlatformInfo PEIM should provide this HOB data, if not ASSERT and return error. // - ASSERT_EFI_ERROR (*PlatformInfoHob != NULL); + ASSERT (*PlatformInfoHob != NULL); if (!(*PlatformInfoHob)) { return EFI_NOT_FOUND; }