UefiCpuPkg: Change OPTIONAL keyword usage style

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

Update all use of ', OPTIONAL' to ' OPTIONAL,' for function params.

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>

27 files changed, 64 insertions, 69 deletions

diff --git a/UefiCpuPkg/CpuDxe/CpuPageTable.c b/UefiCpuPkg/CpuDxe/CpuPageTable.c
index 06ee1b8231..c34059f87f 100644
--- a/UefiCpuPkg/CpuDxe/CpuPageTable.c
+++ b/UefiCpuPkg/CpuDxe/CpuPageTable.c
@@ -691,7 +691,7 @@ ConvertMemoryPageAttributes (
   IN  UINT64                            Attributes,

   IN  PAGE_ACTION                       PageAction,

   IN  PAGE_TABLE_LIB_ALLOCATE_PAGES     AllocatePagesFunc OPTIONAL,

-  OUT BOOLEAN                           *IsSplitted,  OPTIONAL

+  OUT BOOLEAN                           *IsSplitted   OPTIONAL,

   OUT BOOLEAN                           *IsModified   OPTIONAL

   )

 {

@@ -1379,4 +1379,3 @@ InitializePageTableLib (
 

   return ;

 }

-

diff --git a/UefiCpuPkg/Include/Library/MpInitLib.h b/UefiCpuPkg/Include/Library/MpInitLib.h
index 31eb227f12..d6a1e6c067 100644
--- a/UefiCpuPkg/Include/Library/MpInitLib.h
+++ b/UefiCpuPkg/Include/Library/MpInitLib.h
@@ -54,7 +54,7 @@ MpInitLibInitialize (
 EFI_STATUS

 EFIAPI

 MpInitLibGetNumberOfProcessors (

-  OUT UINTN                     *NumberOfProcessors,       OPTIONAL

+  OUT UINTN                     *NumberOfProcessors        OPTIONAL,

   OUT UINTN                     *NumberOfEnabledProcessors OPTIONAL

   );

 

diff --git a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
index 27bd2f6b48..60caf313bf 100644
--- a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
+++ b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
@@ -252,7 +252,7 @@ RETURN_STATUS
 (EFIAPI *CPU_FEATURE_INITIALIZE)(

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -303,10 +303,10 @@ RETURN_STATUS
 RETURN_STATUS

 EFIAPI

 RegisterCpuFeature (

-  IN CHAR8                             *FeatureName,       OPTIONAL

-  IN CPU_FEATURE_GET_CONFIG_DATA       GetConfigDataFunc,  OPTIONAL

-  IN CPU_FEATURE_SUPPORT               SupportFunc,        OPTIONAL

-  IN CPU_FEATURE_INITIALIZE            InitializeFunc,     OPTIONAL

+  IN CHAR8                             *FeatureName        OPTIONAL,

+  IN CPU_FEATURE_GET_CONFIG_DATA       GetConfigDataFunc   OPTIONAL,

+  IN CPU_FEATURE_SUPPORT               SupportFunc         OPTIONAL,

+  IN CPU_FEATURE_INITIALIZE            InitializeFunc      OPTIONAL,

   ...

   );

 

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c
index 4a56eec1b2..80a7df2957 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c
@@ -87,7 +87,7 @@ EFIAPI
 AesniInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   )

 {

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/C1e.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/C1e.c
index 6f96857332..98a3408370 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/C1e.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/C1e.c
@@ -57,7 +57,7 @@ EFIAPI
 C1eInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   )

 {

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/ClockModulation.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/ClockModulation.c
index b1c6bf6148..94d596605b 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/ClockModulation.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/ClockModulation.c
@@ -99,7 +99,7 @@ EFIAPI
 ClockModulationInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   )

 {

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeatures.h b/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeatures.h
index b2390e6c39..74f27dcc44 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeatures.h
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeatures.h
@@ -83,7 +83,7 @@ EFIAPI
 AesniInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -148,7 +148,7 @@ EFIAPI
 ClockModulationInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -200,7 +200,7 @@ EFIAPI
 EistInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -250,7 +250,7 @@ EFIAPI
 ExecuteDisableInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -276,7 +276,7 @@ EFIAPI
 FastStringsInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -326,7 +326,7 @@ EFIAPI
 MonitorMwaitInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -376,7 +376,7 @@ EFIAPI
 VmxInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -426,7 +426,7 @@ EFIAPI
 LockFeatureControlRegisterInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -477,7 +477,7 @@ EFIAPI
 SmxInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -527,7 +527,7 @@ EFIAPI
 LimitCpuidMaxvalInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -577,7 +577,7 @@ EFIAPI
 MceInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -627,7 +627,7 @@ EFIAPI
 McaInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -677,7 +677,7 @@ EFIAPI
 McgCtlInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -727,7 +727,7 @@ EFIAPI
 PendingBreakInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -777,7 +777,7 @@ EFIAPI
 C1eInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -844,7 +844,7 @@ EFIAPI
 X2ApicInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -914,7 +914,7 @@ EFIAPI
 PpinInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -966,7 +966,7 @@ EFIAPI
 LmceInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

@@ -1032,7 +1032,7 @@ EFIAPI
 ProcTraceInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   );

 

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/Eist.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/Eist.c
index e60220d3c4..ed42afe289 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/Eist.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/Eist.c
@@ -59,7 +59,7 @@ EFIAPI
 EistInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   )

 {

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/FastStrings.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/FastStrings.c
index 2b678f3bf5..9ae5216555 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/FastStrings.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/FastStrings.c
@@ -30,7 +30,7 @@ EFIAPI
 FastStringsInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   )

 {

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/FeatureControl.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/FeatureControl.c
index b4474d2fab..8ad81a6e87 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/FeatureControl.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/FeatureControl.c
@@ -57,7 +57,7 @@ EFIAPI
 VmxInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   )

 {

@@ -135,7 +135,7 @@ EFIAPI
 LockFeatureControlRegisterInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   )

 {

@@ -214,7 +214,7 @@ EFIAPI
 SmxInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   )

 {

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c
index 906ed65408..71d82eab8d 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c
@@ -60,7 +60,7 @@ EFIAPI
 LimitCpuidMaxvalInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   )

 {

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/MachineCheck.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/MachineCheck.c
index a3a2861cee..0e78a0ce26 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/MachineCheck.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/MachineCheck.c
@@ -57,7 +57,7 @@ EFIAPI
 MceInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   )

 {

@@ -127,7 +127,7 @@ EFIAPI
 McaInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   )

 {

@@ -241,7 +241,7 @@ EFIAPI
 McgCtlInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   )

 {

@@ -315,7 +315,7 @@ EFIAPI
 LmceInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   )

 {

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/MonitorMwait.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/MonitorMwait.c
index 08dbb670aa..9fcbaf8d5d 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/MonitorMwait.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/MonitorMwait.c
@@ -57,7 +57,7 @@ EFIAPI
 MonitorMwaitInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   )

 {

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/PendingBreak.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/PendingBreak.c
index 9c20a60eff..3d7030d609 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/PendingBreak.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/PendingBreak.c
@@ -64,7 +64,7 @@ EFIAPI
 PendingBreakInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   )

 {

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/Ppin.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/Ppin.c
index 3c4c1bc706..468e425a0b 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/Ppin.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/Ppin.c
@@ -108,7 +108,7 @@ EFIAPI
 PpinInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   )

 {

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/ProcTrace.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/ProcTrace.c
index 611459105d..e567ed54e7 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/ProcTrace.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/ProcTrace.c
@@ -166,7 +166,7 @@ EFIAPI
 ProcTraceInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   )

 {

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/X2Apic.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/X2Apic.c
index 44b07749ff..181dcae21c 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/X2Apic.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/X2Apic.c
@@ -90,7 +90,7 @@ EFIAPI
 X2ApicInitialize (

   IN UINTN                             ProcessorNumber,

   IN REGISTER_CPU_FEATURE_INFORMATION  *CpuInfo,

-  IN VOID                              *ConfigData,  OPTIONAL

+  IN VOID                              *ConfigData   OPTIONAL,

   IN BOOLEAN                           State

   )

 {

diff --git a/UefiCpuPkg/Library/CpuTimerLib/CpuTimerLib.c b/UefiCpuPkg/Library/CpuTimerLib/CpuTimerLib.c
index 192a401fe6..bce02eeef9 100644
--- a/UefiCpuPkg/Library/CpuTimerLib/CpuTimerLib.c
+++ b/UefiCpuPkg/Library/CpuTimerLib/CpuTimerLib.c
@@ -219,7 +219,7 @@ GetPerformanceCounter (
 UINT64

 EFIAPI

 GetPerformanceCounterProperties (

-  OUT UINT64  *StartValue,  OPTIONAL

+  OUT UINT64  *StartValue   OPTIONAL,

   OUT UINT64  *EndValue     OPTIONAL

   )

 {

@@ -276,4 +276,3 @@ GetTimeInNanoSecond (
 

   return NanoSeconds;

 }

-

diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c
index b9a06747ed..84c9438992 100644
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c
@@ -1333,8 +1333,8 @@ WakeUpAP (
   IN CPU_MP_DATA               *CpuMpData,

   IN BOOLEAN                   Broadcast,

   IN UINTN                     ProcessorNumber,

-  IN EFI_AP_PROCEDURE          Procedure,              OPTIONAL

-  IN VOID                      *ProcedureArgument,     OPTIONAL

+  IN EFI_AP_PROCEDURE          Procedure               OPTIONAL,

+  IN VOID                      *ProcedureArgument      OPTIONAL,

   IN BOOLEAN                   WakeUpDisabledAps

   )

 {

@@ -2534,7 +2534,7 @@ MpInitLibWhoAmI (
 EFI_STATUS

 EFIAPI

 MpInitLibGetNumberOfProcessors (

-  OUT UINTN                     *NumberOfProcessors,       OPTIONAL

+  OUT UINTN                     *NumberOfProcessors        OPTIONAL,

   OUT UINTN                     *NumberOfEnabledProcessors OPTIONAL

   )

 {

diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpInitLib/MpLib.h
index e88a5355c9..98a207c628 100644
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.h
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h
@@ -466,8 +466,8 @@ WakeUpAP (
   IN CPU_MP_DATA               *CpuMpData,

   IN BOOLEAN                   Broadcast,

   IN UINTN                     ProcessorNumber,

-  IN EFI_AP_PROCEDURE          Procedure,              OPTIONAL

-  IN VOID                      *ProcedureArgument,     OPTIONAL

+  IN EFI_AP_PROCEDURE          Procedure               OPTIONAL,

+  IN VOID                      *ProcedureArgument      OPTIONAL,

   IN BOOLEAN                   WakeUpDisabledAps       OPTIONAL

   );

 

@@ -742,4 +742,3 @@ PlatformShadowMicrocode (
   );

 

 #endif

-

diff --git a/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.c b/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.c
index b4024ee1ae..7a461af9b1 100644
--- a/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.c
+++ b/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.c
@@ -63,7 +63,7 @@ MpInitLibInitialize (
 EFI_STATUS

 EFIAPI

 MpInitLibGetNumberOfProcessors (

-  OUT UINTN                     *NumberOfProcessors,       OPTIONAL

+  OUT UINTN                     *NumberOfProcessors        OPTIONAL,

   OUT UINTN                     *NumberOfEnabledProcessors OPTIONAL

   )

 {

diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
index ceab7a065f..2021f0c4f9 100644
--- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
+++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
@@ -1287,8 +1287,8 @@ MtrrLibCalculateSubtractivePath (
   IN UINT16                      Stop,

   IN UINT8                       Types,

   IN UINT8                       TypeCount,

-  IN OUT MTRR_MEMORY_RANGE       *Mtrrs,       OPTIONAL

-  IN UINT32                      MtrrCapacity, OPTIONAL

+  IN OUT MTRR_MEMORY_RANGE       *Mtrrs        OPTIONAL,

+  IN UINT32                      MtrrCapacity  OPTIONAL,

   IN OUT UINT32                  *MtrrCount    OPTIONAL

   )

 {

diff --git a/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.h b/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.h
index 16cead867f..071c858a4c 100644
--- a/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.h
+++ b/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.h
@@ -129,7 +129,7 @@ VOID
 GenerateRandomMtrrPair (

   IN  UINT32                 PhysicalAddressBits,

   IN  MTRR_MEMORY_CACHE_TYPE CacheType,

-  OUT MTRR_VARIABLE_SETTING  *MtrrPair,       OPTIONAL

+  OUT MTRR_VARIABLE_SETTING  *MtrrPair        OPTIONAL,

   OUT MTRR_MEMORY_RANGE      *MtrrMemoryRange OPTIONAL

   );

 

diff --git a/UefiCpuPkg/Library/MtrrLib/UnitTest/Support.c b/UefiCpuPkg/Library/MtrrLib/UnitTest/Support.c
index 4fc222bdee..d8511fefe8 100644
--- a/UefiCpuPkg/Library/MtrrLib/UnitTest/Support.c
+++ b/UefiCpuPkg/Library/MtrrLib/UnitTest/Support.c
@@ -113,9 +113,9 @@ UINT32
 EFIAPI

 UnitTestMtrrLibAsmCpuid (

   IN      UINT32                    Index,

-  OUT     UINT32                    *Eax,  OPTIONAL

-  OUT     UINT32                    *Ebx,  OPTIONAL

-  OUT     UINT32                    *Ecx,  OPTIONAL

+  OUT     UINT32                    *Eax   OPTIONAL,

+  OUT     UINT32                    *Ebx   OPTIONAL,

+  OUT     UINT32                    *Ecx   OPTIONAL,

   OUT     UINT32                    *Edx   OPTIONAL

   )

 {

@@ -423,7 +423,7 @@ VOID
 GenerateRandomMtrrPair (

   IN  UINT32                 PhysicalAddressBits,

   IN  MTRR_MEMORY_CACHE_TYPE CacheType,

-  OUT MTRR_VARIABLE_SETTING  *MtrrPair,       OPTIONAL

+  OUT MTRR_VARIABLE_SETTING  *MtrrPair        OPTIONAL,

   OUT MTRR_MEMORY_RANGE      *MtrrMemoryRange OPTIONAL

   )

 {

diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
index e6ef9c602d..ffe34ffb48 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
@@ -803,10 +803,10 @@ SetCpuFeaturesBitMask (
 RETURN_STATUS

 EFIAPI

 RegisterCpuFeature (

-  IN CHAR8                             *FeatureName,       OPTIONAL

-  IN CPU_FEATURE_GET_CONFIG_DATA       GetConfigDataFunc,  OPTIONAL

-  IN CPU_FEATURE_SUPPORT               SupportFunc,        OPTIONAL

-  IN CPU_FEATURE_INITIALIZE            InitializeFunc,     OPTIONAL

+  IN CHAR8                             *FeatureName        OPTIONAL,

+  IN CPU_FEATURE_GET_CONFIG_DATA       GetConfigDataFunc   OPTIONAL,

+  IN CPU_FEATURE_SUPPORT               SupportFunc         OPTIONAL,

+  IN CPU_FEATURE_INITIALIZE            InitializeFunc      OPTIONAL,

   ...

   )

 {

@@ -1288,4 +1288,3 @@ SwitchBspAfterFeaturesInitialize (
   CpuFeaturesData = GetCpuFeaturesData ();

   CpuFeaturesData->BspNumber = ProcessorNumber;

 }

-

diff --git a/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c b/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c
index 5d7fa80dd1..8e2a420f80 100644
--- a/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c
+++ b/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c
@@ -200,7 +200,7 @@ GetPerformanceCounter (
 UINT64

 EFIAPI

 GetPerformanceCounterProperties (

-  OUT      UINT64                    *StartValue,  OPTIONAL

+  OUT      UINT64                    *StartValue   OPTIONAL,

   OUT      UINT64                    *EndValue     OPTIONAL

   )

 {

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
index 766eb1246a..12dde85cf1 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
@@ -405,7 +405,7 @@ ConvertMemoryPageAttributes (
   IN  UINT64                            Length,

   IN  UINT64                            Attributes,

   IN  BOOLEAN                           IsSet,

-  OUT BOOLEAN                           *IsSplitted,  OPTIONAL

+  OUT BOOLEAN                           *IsSplitted   OPTIONAL,

   OUT BOOLEAN                           *IsModified   OPTIONAL

   )

 {

@@ -1568,4 +1568,3 @@ EdkiiSmmGetMemoryAttributes (
 

   return EFI_SUCCESS;

 }

-