diff --git a/ArmPkg/Drivers/MmCommunicationPei/MmCommunicationPei.c b/ArmPkg/Drivers/MmCommunicationPei/MmCommunicationPei.c
index 5dbe99fc31..ccb182668d 100644
--- a/ArmPkg/Drivers/MmCommunicationPei/MmCommunicationPei.c
+++ b/ArmPkg/Drivers/MmCommunicationPei/MmCommunicationPei.c
@@ -159,8 +159,8 @@ MmCommunicationPeim (
       }
 
       CopyMem (CommBuffer, CommunicateHeader, BufferSize);
-      *CommSize  = BufferSize;
-      Status     = EFI_SUCCESS;
+      *CommSize = BufferSize;
+      Status    = EFI_SUCCESS;
       break;
 
     case ARM_SMC_MM_RET_INVALID_PARAMS:
@@ -197,7 +197,7 @@ STATIC CONST EFI_PEI_MM_COMMUNICATION_PPI  mPeiMmCommunication = {
 STATIC CONST EFI_PEI_PPI_DESCRIPTOR  mPeiMmCommunicationPpi = {
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
   &gEfiPeiMmCommunicationPpiGuid,
-  (VOID*)&mPeiMmCommunication
+  (VOID *)&mPeiMmCommunication
 };
 
 /**
diff --git a/ArmPkg/Include/IndustryStandard/ArmStdSmc.h b/ArmPkg/Include/IndustryStandard/ArmStdSmc.h
index 616c650d07..f3d78d8e78 100644
--- a/ArmPkg/Include/IndustryStandard/ArmStdSmc.h
+++ b/ArmPkg/Include/IndustryStandard/ArmStdSmc.h
@@ -248,9 +248,9 @@
  *  SMC64 SiP Service Calls
  */
 
-#define SMC_FASTCALL           0x80000000
-#define SMC64_FUNCTION         (SMC_FASTCALL     | 0x40000000)
-#define SMC_SIP_FUNCTION       (SMC64_FUNCTION   | 0x02000000)
-#define SMC_SIP_FUNCTION_ID(n) (SMC_SIP_FUNCTION | (n))
+#define SMC_FASTCALL      0x80000000
+#define SMC64_FUNCTION    (SMC_FASTCALL     | 0x40000000)
+#define SMC_SIP_FUNCTION  (SMC64_FUNCTION   | 0x02000000)
+#define SMC_SIP_FUNCTION_ID(n)  (SMC_SIP_FUNCTION | (n))
 
 #endif // ARM_STD_SMC_H_