From: Star Zeng <star.zeng@intel.com>
Date: Mon, 5 Jun 2017 06:31:19 +0000 (+0800)
Subject: MdePkg SmmIoLib: Use NULL pointer check instead of useless Status check
X-Git-Tag: edk2-stable201903~3963
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=7b5d848dbfc3abe8b8c6066168bf10eca39d5891

MdePkg SmmIoLib: Use NULL pointer check instead of useless Status check

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=587

The Status check in "if (!EFI_ERROR (Status))" condition is useless,
it should be NULL pointer check. And this patch also fixes a typo
"continous" to "continuous".

Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
---

diff --git a/MdePkg/Library/SmmIoLib/SmmIoLib.c b/MdePkg/Library/SmmIoLib/SmmIoLib.c
index 181abb8e25..f1cb0dace5 100644
--- a/MdePkg/Library/SmmIoLib/SmmIoLib.c
+++ b/MdePkg/Library/SmmIoLib/SmmIoLib.c
@@ -156,7 +156,7 @@ SmmIsMmioValid (
 }
 
 /**
-  Merge continous entries whose type is EfiGcdMemoryTypeMemoryMappedIo.
+  Merge continuous entries whose type is EfiGcdMemoryTypeMemoryMappedIo.
 
   @param[in, out]  GcdMemoryMap           A pointer to the buffer in which firmware places
                                           the current GCD memory map.
@@ -217,7 +217,8 @@ MergeGcdMmioEntry (
   @param[in] Interface  Points to the interface instance.
   @param[in] Handle     The handle on which the interface was installed.
 
-  @retval EFI_SUCCESS   Notification runs successfully.
+  @retval EFI_SUCCESS           Notification runs successfully.
+  @retval EFI_OUT_OF_RESOURCES  No enough resources to save GCD MMIO map.
 **/
 EFI_STATUS
 EFIAPI
@@ -237,10 +238,10 @@ SmmIoLibInternalEndOfDxeNotify (
     MergeGcdMmioEntry (MemSpaceMap, &NumberOfDescriptors);
 
     mSmmIoLibGcdMemSpace = AllocateCopyPool (NumberOfDescriptors * sizeof (EFI_GCD_MEMORY_SPACE_DESCRIPTOR), MemSpaceMap);
-    ASSERT_EFI_ERROR (Status);
-    if (EFI_ERROR (Status)) {
+    ASSERT (mSmmIoLibGcdMemSpace != NULL);
+    if (mSmmIoLibGcdMemSpace == NULL) {
       gBS->FreePool (MemSpaceMap);
-      return Status;
+      return EFI_OUT_OF_RESOURCES;
     }
 
     mSmmIoLibGcdMemNumberOfDesc = NumberOfDescriptors;