diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c
index 377876643f..5c562d4759 100644
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c
@@ -1014,7 +1014,7 @@ WakeUpAP (
         CpuData = &CpuMpData->CpuData[Index];
         //
         // All AP(include disabled AP) will be woke up by INIT-SIPI-SIPI, but
-        // the AP procedure will be skipped for disabled AP because AP state 
+        // the AP procedure will be skipped for disabled AP because AP state
         // is not CpuStateReady.
         //
         if (GetApState (CpuData) == CpuStateDisabled && !WakeUpDisabledAps) {
diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpInitLib/MpLib.h
index 75f3fdda1d..773db76b61 100644
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.h
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h
@@ -257,7 +257,7 @@ struct _CPU_MP_DATA {
   // Whether need to use Init-Sipi-Sipi to wake up the APs.
   // Two cases need to set this value to TRUE. One is in HLT
   // loop mode, the other is resume from S3 which loop mode
-  // will be hardcode change to HLT mode by PiSmmCpuDxeSmm 
+  // will be hardcode change to HLT mode by PiSmmCpuDxeSmm
   // driver.
   //
   BOOLEAN                        WakeUpByInitSipiSipi;
diff --git a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf b/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf
index 43a3b3b036..81036f0b12 100644
--- a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf
+++ b/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf
@@ -67,4 +67,4 @@
   gUefiCpuPkgTokenSpaceGuid.PcdCpuApTargetCstate                   ## SOMETIMES_CONSUMES
 
 [Guids]
-  gEdkiiS3SmmInitDoneGuid
\ No newline at end of file
+  gEdkiiS3SmmInitDoneGuid
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
index 4143ee4bb1..fa7e107e39 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
@@ -516,7 +516,7 @@ AllocateAcpiCpuData (
 
   //
   // Allocate buffer for empty RegisterTable and PreSmmInitRegisterTable for all CPUs
-  //  
+  //
   TableSize = 2 * NumberOfCpus * sizeof (CPU_REGISTER_TABLE);
   RegisterTable  = AllocatePages (EFI_SIZE_TO_PAGES (TableSize));
   ASSERT (RegisterTable != NULL);