UefiCpuPkg/SmmCpuFeaturesLib: Cleanup library constructors

[mirror_edk2.git] / UefiCpuPkg / Library / SmmCpuFeaturesLib / SmmStm.c

diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c
index b5aad41fdb6474ab69f5e1b9b5133fb0de120a12..dcc2e9f9a09a3c11ed5a747f4caa01e62d8e8fa6 100644 (file)
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c
+++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c
@@ -30,22 +30,6 @@
 #define RDWR_ACCS             3\r
 #define FULL_ACCS             7\r
 \r
-/**\r
-  The constructor function\r
-\r
-  @param[in]  ImageHandle  The firmware allocated handle for the EFI image.\r
-  @param[in]  SystemTable  A pointer to the EFI System Table.\r
-\r
-  @retval EFI_SUCCESS      The constructor always returns EFI_SUCCESS.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-SmmCpuFeaturesLibConstructor (\r
-  IN EFI_HANDLE        ImageHandle,\r
-  IN EFI_SYSTEM_TABLE  *SystemTable\r
-  );\r
-\r
 EFI_HANDLE  mStmSmmCpuHandle = NULL;\r
 \r
 BOOLEAN mLockLoadMonitor = FALSE;\r
@@ -112,7 +96,7 @@ UINTN  mMsegSize = 0;
 BOOLEAN  mStmConfigurationTableInitialized = FALSE;\r
 \r
 /**\r
-  The constructor function\r
+  The constructor function for the Traditional MM library instance with STM.\r
 \r
   @param[in]  ImageHandle  The firmware allocated handle for the EFI image.\r
   @param[in]  SystemTable  A pointer to the EFI System Table.\r
@@ -138,10 +122,9 @@ SmmCpuFeaturesLibStmConstructor (
   SmmCpuFeaturesLibStmSmiEntryFixupAddress ();\r
 \r
   //\r
-  // Call the common constructor function\r
+  // Perform library initialization common across all instances\r
   //\r
-  Status = SmmCpuFeaturesLibConstructor (ImageHandle, SystemTable);\r
-  ASSERT_EFI_ERROR (Status);\r
+  CpuFeaturesLibInitialization ();\r
 \r
   //\r
   // Lookup the MP Services Protocol\r