From patchwork Tue Jun 28 13:25:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 71078 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1584588qgy; Tue, 28 Jun 2016 06:25:54 -0700 (PDT) X-Received: by 10.98.99.132 with SMTP id x126mr1874098pfb.48.1467120354364; Tue, 28 Jun 2016 06:25:54 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id vz6si21133104pab.106.2016.06.28.06.25.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jun 2016 06:25:54 -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 B37F91A1E15; Tue, 28 Jun 2016 06:26:28 -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 E161A1A1E10 for ; Tue, 28 Jun 2016 06:26:26 -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 B30293B720; Tue, 28 Jun 2016 13:25:51 +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 u5SDPfYY024563; Tue, 28 Jun 2016 09:25:50 -0400 From: Laszlo Ersek To: edk2-devel-01 Date: Tue, 28 Jun 2016 15:25:35 +0200 Message-Id: <1467120338-12587-4-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.30]); Tue, 28 Jun 2016 13:25:51 +0000 (UTC) Subject: [edk2] [PATCH 3/6] QuarkPlatformPkg: 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: Michael D Kinney 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: Michael D Kinney Cc: Kelly Steele Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek --- Notes: not even build tested QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/AcpiPlatform.c | 2 +- QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/MadtPlatform.c | 2 +- QuarkPlatformPkg/Library/PlatformHelperLib/PlatformHelperDxe.c | 2 +- QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.c | 2 +- 4 files changed, 4 insertions(+), 4 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/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/AcpiPlatform.c b/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/AcpiPlatform.c index 309eb041ee92..36300efd3146 100644 --- a/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/AcpiPlatform.c +++ b/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/AcpiPlatform.c @@ -680,7 +680,7 @@ AcpiPlatformEntryPoint ( // Init Pci Device PRT PRW information structure from PCD // mConfigData = (PCI_DEVICE_SETTING *)AllocateZeroPool (sizeof (PCI_DEVICE_SETTING)); - ASSERT_EFI_ERROR (mConfigData); + ASSERT (mConfigData != NULL); InitPciDeviceInfoStructure (mConfigData); // // Get the Acpi SDT protocol for manipulation on acpi table diff --git a/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/MadtPlatform.c b/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/MadtPlatform.c index 11781e03f4c5..98035bedd58f 100644 --- a/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/MadtPlatform.c +++ b/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/MadtPlatform.c @@ -218,7 +218,7 @@ MadtTableInitialize ( //ASSERT (NumberOfCPUs <= 2 && NumberOfCPUs > 0); MadtSize = GetAcutalMadtTableSize (&MadtConfigData, NumberOfCPUs); Madt = (EFI_ACPI_2_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *)AllocateZeroPool (MadtSize); - ASSERT_EFI_ERROR (Madt); + ASSERT (Madt != NULL); // // Initialize MADT Header information // diff --git a/QuarkPlatformPkg/Library/PlatformHelperLib/PlatformHelperDxe.c b/QuarkPlatformPkg/Library/PlatformHelperLib/PlatformHelperDxe.c index 441f7609a536..39185bc0d5ff 100644 --- a/QuarkPlatformPkg/Library/PlatformHelperLib/PlatformHelperDxe.c +++ b/QuarkPlatformPkg/Library/PlatformHelperLib/PlatformHelperDxe.c @@ -174,7 +174,7 @@ PlatformFlashLockConfig ( // SpiProtocol = LocateSpiProtocol (NULL); // This routine will not be called in SMM. - ASSERT_EFI_ERROR (SpiProtocol != NULL); + ASSERT (SpiProtocol != NULL); if (SpiProtocol != NULL) { Status = SpiProtocol->Lock (SpiProtocol); diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.c b/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.c index df6c1cc23240..6b07d7829328 100644 --- a/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.c +++ b/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.c @@ -1034,7 +1034,7 @@ InstallS3Memory ( // memory above 1MB. So Memory Callback can set cache for the system memory // correctly on S3 boot path, just like it does on Normal boot path. // - ASSERT_EFI_ERROR ((S3MemoryRangeData->SystemMemoryLength - 0x100000) > 0); + ASSERT ((S3MemoryRangeData->SystemMemoryLength - 0x100000) > 0); BuildResourceDescriptorHob ( EFI_RESOURCE_SYSTEM_MEMORY, (