MdeModulePkg: 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: Liming Gao <gaoliming@byosoft.com.cn>

38 files changed, 166 insertions, 180 deletions

diff --git a/MdeModulePkg/Library/BaseHobLibNull/BaseHobLibNull.c b/MdeModulePkg/Library/BaseHobLibNull/BaseHobLibNull.c
index f740195ef9..41ff4412ce 100644
--- a/MdeModulePkg/Library/BaseHobLibNull/BaseHobLibNull.c
+++ b/MdeModulePkg/Library/BaseHobLibNull/BaseHobLibNull.c
@@ -408,7 +408,7 @@ BuildFv3Hob (
   IN          UINT64                      Length,

   IN          UINT32                      AuthenticationStatus,

   IN          BOOLEAN                     ExtractedFv,

-  IN CONST    EFI_GUID                    *FvName, OPTIONAL

+  IN CONST    EFI_GUID                    *FvName  OPTIONAL,

   IN CONST    EFI_GUID                    *FileName OPTIONAL

   )

 {

diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/GuidedSectionExtraction.c b/MdeModulePkg/Library/BrotliCustomDecompressLib/GuidedSectionExtraction.c
index bb7665f82b..fd5a0d7cdb 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/GuidedSectionExtraction.c
+++ b/MdeModulePkg/Library/BrotliCustomDecompressLib/GuidedSectionExtraction.c
@@ -127,7 +127,7 @@ EFIAPI
 BrotliGuidedSectionExtraction (

   IN CONST  VOID    *InputSection,

   OUT       VOID    **OutputBuffer,

-  OUT       VOID    *ScratchBuffer,        OPTIONAL

+  OUT       VOID    *ScratchBuffer         OPTIONAL,

   OUT       UINT32  *AuthenticationStatus

   )

 {

diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
index e97a2b94e9..4dca484eb8 100644
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
+++ b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
@@ -404,7 +404,7 @@ UpdateStatusBar (
 VOID

 EFIAPI

 CreateDialog (

-  OUT EFI_INPUT_KEY  *Key,        OPTIONAL

+  OUT EFI_INPUT_KEY  *Key         OPTIONAL,

   ...

   )

 {

@@ -949,4 +949,3 @@ CustomizedDisplayLibDestructor (
 

   return EFI_SUCCESS;

 }

-

diff --git a/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.c b/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.c
index b4f90e172f..e180f90e6b 100644
--- a/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.c
+++ b/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.c
@@ -34,7 +34,7 @@ VOID
 EFIAPI

 InitializeDebugAgent (

   IN UINT32                InitFlag,

-  IN VOID                  *Context, OPTIONAL

+  IN VOID                  *Context  OPTIONAL,

   IN DEBUG_AGENT_CONTINUE  Function  OPTIONAL

   )

 {

@@ -63,4 +63,3 @@ SaveAndSetDebugTimerInterrupt (
 {

   return FALSE;

 }

-

diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
index 90942135d7..395311b2bf 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
+++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
@@ -91,7 +91,7 @@ RecordFmpCapsuleStatusVariable (
   IN EFI_STATUS                                    CapsuleStatus,

   IN UINTN                                         PayloadIndex,

   IN EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER  *ImageHeader,

-  IN EFI_DEVICE_PATH_PROTOCOL                      *FmpDevicePath, OPTIONAL

+  IN EFI_DEVICE_PATH_PROTOCOL                      *FmpDevicePath  OPTIONAL,

   IN CHAR16                                        *CapFileName    OPTIONAL

   );

 

@@ -651,8 +651,8 @@ EFI_STATUS
 GetFmpHandleBufferByType (

   IN     EFI_GUID                     *UpdateImageTypeId,

   IN     UINT64                       UpdateHardwareInstance,

-  OUT    UINTN                        *NoHandles, OPTIONAL

-  OUT    EFI_HANDLE                   **HandleBuf, OPTIONAL

+  OUT    UINTN                        *NoHandles  OPTIONAL,

+  OUT    EFI_HANDLE                   **HandleBuf  OPTIONAL,

   OUT    BOOLEAN                      **ResetRequiredBuf OPTIONAL

   )

 {

@@ -1083,7 +1083,7 @@ StartFmpImage (
 **/

 VOID

 RecordFmpCapsuleStatus (

-  IN EFI_HANDLE                                    Handle,  OPTIONAL

+  IN EFI_HANDLE                                    Handle   OPTIONAL,

   IN EFI_CAPSULE_HEADER                            *CapsuleHeader,

   IN EFI_STATUS                                    CapsuleStatus,

   IN UINTN                                         PayloadIndex,

@@ -1170,7 +1170,7 @@ RecordFmpCapsuleStatus (
 EFI_STATUS

 ProcessFmpCapsuleImage (

   IN EFI_CAPSULE_HEADER  *CapsuleHeader,

-  IN CHAR16              *CapFileName,  OPTIONAL

+  IN CHAR16              *CapFileName   OPTIONAL,

   OUT BOOLEAN            *ResetRequired OPTIONAL

   )

 {

@@ -1506,7 +1506,7 @@ EFI_STATUS
 EFIAPI

 ProcessThisCapsuleImage (

   IN EFI_CAPSULE_HEADER  *CapsuleHeader,

-  IN CHAR16              *CapFileName,  OPTIONAL

+  IN CHAR16              *CapFileName   OPTIONAL,

   OUT BOOLEAN            *ResetRequired OPTIONAL

   )

 {

diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleProcessLib.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleProcessLib.c
index f2cd0ad3e8..6d05a9f229 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleProcessLib.c
+++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleProcessLib.c
@@ -148,7 +148,7 @@ EFI_STATUS
 EFIAPI

 ProcessThisCapsuleImage (

   IN EFI_CAPSULE_HEADER  *CapsuleHeader,

-  IN CHAR16              *CapFileName,  OPTIONAL

+  IN CHAR16              *CapFileName   OPTIONAL,

   OUT BOOLEAN            *ResetRequired OPTIONAL

   );

 

diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c
index 4f718129c6..82f8c1f49c 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c
+++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c
@@ -231,7 +231,7 @@ RecordFmpCapsuleStatusVariable (
   IN EFI_STATUS                                    CapsuleStatus,

   IN UINTN                                         PayloadIndex,

   IN EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER  *ImageHeader,

-  IN EFI_DEVICE_PATH_PROTOCOL                      *FmpDevicePath, OPTIONAL

+  IN EFI_DEVICE_PATH_PROTOCOL                      *FmpDevicePath  OPTIONAL,

   IN CHAR16                                        *CapFileName    OPTIONAL

   )

 {

diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLibNull.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLibNull.c
index b09631830f..958229521e 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLibNull.c
+++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLibNull.c
@@ -50,7 +50,7 @@ RecordFmpCapsuleStatusVariable (
   IN EFI_STATUS                                    CapsuleStatus,

   IN UINTN                                         PayloadIndex,

   IN EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER  *ImageHeader,

-  IN EFI_DEVICE_PATH_PROTOCOL                      *FmpDevicePath, OPTIONAL

+  IN EFI_DEVICE_PATH_PROTOCOL                      *FmpDevicePath  OPTIONAL,

   IN CHAR16                                        *CapFileName    OPTIONAL

   )

 {

diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
index f8778c2518..eb9cea5011 100644
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
+++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
@@ -932,11 +932,11 @@ GetDeviceInfoFromHandleAndUpdateLength (
 **/

 EFI_STATUS

 InsertFpdtRecord (

-  IN CONST VOID                        *CallerIdentifier,  OPTIONAL

-  IN CONST VOID                        *Guid,    OPTIONAL

-  IN CONST CHAR8                       *String,  OPTIONAL

+  IN CONST VOID                        *CallerIdentifier   OPTIONAL,

+  IN CONST VOID                        *Guid     OPTIONAL,

+  IN CONST CHAR8                       *String   OPTIONAL,

   IN       UINT64                      Ticker,

-  IN       UINT64                      Address,  OPTIONAL

+  IN       UINT64                      Address   OPTIONAL,

   IN       UINT16                      PerfId,

   IN       PERF_MEASUREMENT_ATTRIBUTE  Attribute

   )

@@ -1513,10 +1513,10 @@ EFI_STATUS
 EFIAPI

 CreatePerformanceMeasurement (

   IN CONST VOID                        *CallerIdentifier,

-  IN CONST VOID                        *Guid,   OPTIONAL

-  IN CONST CHAR8                       *String, OPTIONAL

+  IN CONST VOID                        *Guid    OPTIONAL,

+  IN CONST CHAR8                       *String  OPTIONAL,

   IN       UINT64                      TimeStamp,

-  IN       UINT64                      Address,  OPTIONAL

+  IN       UINT64                      Address   OPTIONAL,

   IN       UINT32                      Identifier,

   IN       PERF_MEASUREMENT_ATTRIBUTE  Attribute

   )

@@ -1565,9 +1565,9 @@ CreatePerformanceMeasurement (
 RETURN_STATUS

 EFIAPI

 StartPerformanceMeasurementEx (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp,

   IN UINT32       Identifier

   )

@@ -1614,9 +1614,9 @@ StartPerformanceMeasurementEx (
 RETURN_STATUS

 EFIAPI

 EndPerformanceMeasurementEx (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp,

   IN UINT32       Identifier

   )

@@ -1719,9 +1719,9 @@ GetPerformanceMeasurementEx (
 RETURN_STATUS

 EFIAPI

 StartPerformanceMeasurement (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp

   )

 {

@@ -1755,9 +1755,9 @@ StartPerformanceMeasurement (
 RETURN_STATUS

 EFIAPI

 EndPerformanceMeasurement (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp

   )

 {

@@ -1859,9 +1859,9 @@ RETURN_STATUS
 EFIAPI

 LogPerformanceMeasurement (

   IN CONST VOID   *CallerIdentifier,

-  IN CONST VOID   *Guid,    OPTIONAL

-  IN CONST CHAR8  *String,  OPTIONAL

-  IN UINT64       Address, OPTIONAL

+  IN CONST VOID   *Guid     OPTIONAL,

+  IN CONST CHAR8  *String   OPTIONAL,

+  IN UINT64       Address  OPTIONAL,

   IN UINT32       Identifier

   )

 {

diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLibInternal.h b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLibInternal.h
index 26e5b40b39..bfb472711e 100644
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLibInternal.h
+++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLibInternal.h
@@ -66,11 +66,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 EFI_STATUS

 EFIAPI

 CreatePerformanceMeasurement(

-  IN CONST VOID                        *CallerIdentifier, OPTIONAL

-  IN CONST VOID                        *Guid,     OPTIONAL

-  IN CONST CHAR8                       *String,   OPTIONAL

-  IN       UINT64                      TimeStamp, OPTIONAL

-  IN       UINT64                      Address,   OPTIONAL

+  IN CONST VOID                        *CallerIdentifier  OPTIONAL,

+  IN CONST VOID                        *Guid      OPTIONAL,

+  IN CONST CHAR8                       *String    OPTIONAL,

+  IN       UINT64                      TimeStamp  OPTIONAL,

+  IN       UINT64                      Address    OPTIONAL,

   IN       UINT32                      Identifier,

   IN       PERF_MEASUREMENT_ATTRIBUTE  Attribute

   );

diff --git a/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.c b/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.c
index 048b4ff389..1c0904c8f0 100644
--- a/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.c
+++ b/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.c
@@ -112,7 +112,7 @@ EFIAPI
 Crc32GuidedSectionHandler (

   IN CONST  VOID    *InputSection,

   OUT       VOID    **OutputBuffer,

-  IN        VOID    *ScratchBuffer,        OPTIONAL

+  IN        VOID    *ScratchBuffer         OPTIONAL,

   OUT       UINT32  *AuthenticationStatus

   )

 {

@@ -227,4 +227,3 @@ DxeCrc32GuidedSectionExtractLibConstructor (
           Crc32GuidedSectionHandler

           );

 }

-

diff --git a/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.c b/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.c
index 2a7837a007..14f29b55bb 100644
--- a/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.c
+++ b/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.c
@@ -77,11 +77,10 @@ EFI_STATUS
 EFIAPI

 ChooseFile (

   IN  EFI_DEVICE_PATH_PROTOCOL  *RootDirectory,

-  IN  CHAR16                    *FileType,  OPTIONAL

-  IN  CHOOSE_HANDLER            ChooseHandler,  OPTIONAL

+  IN  CHAR16                    *FileType   OPTIONAL,

+  IN  CHOOSE_HANDLER            ChooseHandler   OPTIONAL,

   OUT EFI_DEVICE_PATH_PROTOCOL  **File  OPTIONAL

   )

 {

   return mProtocol->ChooseFile (RootDirectory, FileType, ChooseHandler, File);

 }

-

diff --git a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
index d2fdd2806e..9a7f8c440a 100644
--- a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
+++ b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
@@ -85,9 +85,9 @@ GetPerformanceMeasurementProtocol (
 RETURN_STATUS

 EFIAPI

 StartPerformanceMeasurementEx (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp,

   IN UINT32       Identifier

   )

@@ -144,9 +144,9 @@ StartPerformanceMeasurementEx (
 RETURN_STATUS

 EFIAPI

 EndPerformanceMeasurementEx (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp,

   IN UINT32       Identifier

   )

@@ -256,9 +256,9 @@ GetPerformanceMeasurementEx (
 RETURN_STATUS

 EFIAPI

 StartPerformanceMeasurement (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp

   )

 {

@@ -290,9 +290,9 @@ StartPerformanceMeasurement (
 RETURN_STATUS

 EFIAPI

 EndPerformanceMeasurement (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp

   )

 {

@@ -392,9 +392,9 @@ RETURN_STATUS
 EFIAPI

 LogPerformanceMeasurement (

   IN CONST VOID   *CallerIdentifier,

-  IN CONST VOID   *Guid,    OPTIONAL

-  IN CONST CHAR8  *String,  OPTIONAL

-  IN  UINT64       Address, OPTIONAL

+  IN CONST VOID   *Guid     OPTIONAL,

+  IN CONST CHAR8  *String   OPTIONAL,

+  IN  UINT64       Address  OPTIONAL,

   IN UINT32       Identifier

   )

 {

diff --git a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
index edd6572578..b702170388 100644
--- a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
+++ b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
@@ -1161,7 +1161,7 @@ InternalPrintLibSPrintMarker (
   IN  UINTN        BufferSize,

   IN  UINTN        Flags,

   IN  CONST CHAR8  *Format,

-  IN  VA_LIST      VaListMarker,   OPTIONAL

+  IN  VA_LIST      VaListMarker    OPTIONAL,

   IN  BASE_LIST    BaseListMarker  OPTIONAL

   );

 

@@ -1321,7 +1321,7 @@ InternalPrintLibSPrintMarker (
   IN  UINTN        BufferSize,

   IN  UINTN        Flags,

   IN  CONST CHAR8  *Format,

-  IN  VA_LIST      VaListMarker,   OPTIONAL

+  IN  VA_LIST      VaListMarker    OPTIONAL,

   IN  BASE_LIST    BaseListMarker  OPTIONAL

   )

 {

diff --git a/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.c b/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.c
index de1eb53183..f72d9a0362 100644
--- a/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.c
+++ b/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.c
@@ -473,7 +473,7 @@ EFIAPI
 ExecuteSecurity2Handlers (

   IN  UINT32                           AuthenticationOperation,

   IN  UINT32                           AuthenticationStatus,

-  IN  CONST EFI_DEVICE_PATH_PROTOCOL   *File, OPTIONAL

+  IN  CONST EFI_DEVICE_PATH_PROTOCOL   *File  OPTIONAL,

   IN  VOID                             *FileBuffer,

   IN  UINTN                            FileSize,

   IN  BOOLEAN                          BootPolicy

diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
index 03630a29bc..b262cf714f 100644
--- a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
+++ b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
@@ -1473,8 +1473,8 @@ EFI_STATUS
 EFIAPI

 ChooseFile (

   IN  EFI_DEVICE_PATH_PROTOCOL  *RootDirectory,

-  IN  CHAR16                    *FileType,  OPTIONAL

-  IN  CHOOSE_HANDLER            ChooseHandler,  OPTIONAL

+  IN  CHAR16                    *FileType   OPTIONAL,

+  IN  CHOOSE_HANDLER            ChooseHandler   OPTIONAL,

   OUT EFI_DEVICE_PATH_PROTOCOL  **File  OPTIONAL

   )

 {

@@ -1648,4 +1648,3 @@ FileExplorerLibDestructor (
 

   return EFI_SUCCESS;

 }

-

diff --git a/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c b/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
index a71221d7de..3731c3f34a 100644
--- a/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
+++ b/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
@@ -649,7 +649,7 @@ RETURN_STATUS
 EFIAPI

 FrameBufferBlt (

   IN     FRAME_BUFFER_CONFIGURE                *Configure,

-  IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL         *BltBuffer, OPTIONAL

+  IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL         *BltBuffer  OPTIONAL,

   IN     EFI_GRAPHICS_OUTPUT_BLT_OPERATION     BltOperation,

   IN     UINTN                                 SourceX,

   IN     UINTN                                 SourceY,

diff --git a/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.c b/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.c
index 2510a5e45f..41d2972b34 100644
--- a/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.c
+++ b/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.c
@@ -111,7 +111,7 @@ RETURN_STATUS
 EFIAPI

 RestoreLockBox (

   IN  GUID                        *Guid,

-  IN  VOID                        *Buffer, OPTIONAL

+  IN  VOID                        *Buffer  OPTIONAL,

   IN  OUT UINTN                   *Length  OPTIONAL

   )

 {

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/F86GuidedSectionExtraction.c b/MdeModulePkg/Library/LzmaCustomDecompressLib/F86GuidedSectionExtraction.c
index ac3fea342e..fefe02033f 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/F86GuidedSectionExtraction.c
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/F86GuidedSectionExtraction.c
@@ -130,7 +130,7 @@ EFIAPI
 LzmaArchGuidedSectionExtraction (

   IN CONST  VOID    *InputSection,

   OUT       VOID    **OutputBuffer,

-  OUT       VOID    *ScratchBuffer,        OPTIONAL

+  OUT       VOID    *ScratchBuffer         OPTIONAL,

   OUT       UINT32  *AuthenticationStatus

   )

 {

@@ -210,4 +210,3 @@ LzmaArchDecompressLibConstructor (
           LzmaArchGuidedSectionExtraction

           );

 }

-

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/GuidedSectionExtraction.c b/MdeModulePkg/Library/LzmaCustomDecompressLib/GuidedSectionExtraction.c
index 8926204d0c..4d89836d0c 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/GuidedSectionExtraction.c
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/GuidedSectionExtraction.c
@@ -128,7 +128,7 @@ EFIAPI
 LzmaGuidedSectionExtraction (

   IN CONST  VOID    *InputSection,

   OUT       VOID    **OutputBuffer,

-  OUT       VOID    *ScratchBuffer,        OPTIONAL

+  OUT       VOID    *ScratchBuffer         OPTIONAL,

   OUT       UINT32  *AuthenticationStatus

   )

 {

@@ -193,4 +193,3 @@ LzmaDecompressLibConstructor (
           LzmaGuidedSectionExtraction

           );

 }

-

diff --git a/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c b/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
index bbe769a082..d545050f02 100644
--- a/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
+++ b/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
@@ -47,10 +47,9 @@ OemHookStatusCodeReport (
   IN EFI_STATUS_CODE_TYPE     CodeType,

   IN EFI_STATUS_CODE_VALUE    Value,

   IN UINT32                   Instance,

-  IN EFI_GUID                 *CallerId, OPTIONAL

+  IN EFI_GUID                 *CallerId  OPTIONAL,

   IN EFI_STATUS_CODE_DATA     *Data      OPTIONAL

   )

 {

   return EFI_SUCCESS;

 }

-

diff --git a/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.c b/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.c
index 483c0c773c..4bd4e4b32e 100644
--- a/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.c
+++ b/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.c
@@ -110,7 +110,7 @@ EFIAPI
 Crc32GuidedSectionHandler (

   IN CONST  VOID    *InputSection,

   OUT       VOID    **OutputBuffer,

-  IN        VOID    *ScratchBuffer,        OPTIONAL

+  IN        VOID    *ScratchBuffer         OPTIONAL,

   OUT       UINT32  *AuthenticationStatus

   )

 {

diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
index ddae0d3815..ac033d4a6a 100644
--- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
+++ b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
@@ -300,11 +300,11 @@ CopyStringIntoPerfRecordAndUpdateLength (
 **/

 EFI_STATUS

 InsertFpdtRecord (

-  IN CONST VOID                        *CallerIdentifier,  OPTIONAL

-  IN CONST VOID                        *Guid,    OPTIONAL

-  IN CONST CHAR8                       *String,  OPTIONAL

+  IN CONST VOID                        *CallerIdentifier   OPTIONAL,

+  IN CONST VOID                        *Guid     OPTIONAL,

+  IN CONST CHAR8                       *String   OPTIONAL,

   IN       UINT64                      Ticker,

-  IN       UINT64                      Address,  OPTIONAL

+  IN       UINT64                      Address   OPTIONAL,

   IN       UINT16                      PerfId,

   IN       PERF_MEASUREMENT_ATTRIBUTE  Attribute

   )

@@ -536,9 +536,9 @@ InsertFpdtRecord (
 RETURN_STATUS

 EFIAPI

 StartPerformanceMeasurementEx (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp,

   IN UINT32       Identifier

   )

@@ -582,9 +582,9 @@ StartPerformanceMeasurementEx (
 RETURN_STATUS

 EFIAPI

 EndPerformanceMeasurementEx (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp,

   IN UINT32       Identifier

   )

@@ -686,9 +686,9 @@ GetPerformanceMeasurementEx (
 RETURN_STATUS

 EFIAPI

 StartPerformanceMeasurement (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp

   )

 {

@@ -718,9 +718,9 @@ StartPerformanceMeasurement (
 RETURN_STATUS

 EFIAPI

 EndPerformanceMeasurement (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp

   )

 {

@@ -822,9 +822,9 @@ RETURN_STATUS
 EFIAPI

 LogPerformanceMeasurement (

   IN CONST VOID   *CallerIdentifier,

-  IN CONST VOID   *Guid,    OPTIONAL

-  IN CONST CHAR8  *String,  OPTIONAL

-  IN UINT64       Address, OPTIONAL

+  IN CONST VOID   *Guid     OPTIONAL,

+  IN CONST CHAR8  *String   OPTIONAL,

+  IN UINT64       Address  OPTIONAL,

   IN UINT32       Identifier

   )

 {

diff --git a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c
index d80f37e520..7cdf5d0b79 100644
--- a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c
+++ b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c
@@ -503,11 +503,11 @@ CopyStringIntoPerfRecordAndUpdateLength (
 **/

 EFI_STATUS

 InsertFpdtRecord (

-  IN CONST VOID                        *CallerIdentifier,  OPTIONAL

-  IN CONST VOID                        *Guid,    OPTIONAL

-  IN CONST CHAR8                       *String,  OPTIONAL

+  IN CONST VOID                        *CallerIdentifier   OPTIONAL,

+  IN CONST VOID                        *Guid     OPTIONAL,

+  IN CONST CHAR8                       *String   OPTIONAL,

   IN       UINT64                      Ticker,

-  IN       UINT64                      Address,  OPTIONAL

+  IN       UINT64                      Address   OPTIONAL,

   IN       UINT16                      PerfId,

   IN       PERF_MEASUREMENT_ATTRIBUTE  Attribute

   )

@@ -1026,11 +1026,11 @@ SmmCorePerformanceLibConstructor (
 EFI_STATUS

 EFIAPI

 CreatePerformanceMeasurement(

-  IN CONST VOID                        *CallerIdentifier, OPTIONAL

-  IN CONST VOID                        *Guid,     OPTIONAL

-  IN CONST CHAR8                       *String,   OPTIONAL

-  IN       UINT64                      TimeStamp, OPTIONAL

-  IN       UINT64                      Address,   OPTIONAL

+  IN CONST VOID                        *CallerIdentifier  OPTIONAL,

+  IN CONST VOID                        *Guid      OPTIONAL,

+  IN CONST CHAR8                       *String    OPTIONAL,

+  IN       UINT64                      TimeStamp  OPTIONAL,

+  IN       UINT64                      Address    OPTIONAL,

   IN       UINT32                      Identifier,

   IN       PERF_MEASUREMENT_ATTRIBUTE  Attribute

   )

@@ -1073,9 +1073,9 @@ CreatePerformanceMeasurement(
 RETURN_STATUS

 EFIAPI

 StartPerformanceMeasurementEx (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp,

   IN UINT32       Identifier

   )

@@ -1122,9 +1122,9 @@ StartPerformanceMeasurementEx (
 RETURN_STATUS

 EFIAPI

 EndPerformanceMeasurementEx (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp,

   IN UINT32       Identifier

   )

@@ -1226,9 +1226,9 @@ GetPerformanceMeasurementEx (
 RETURN_STATUS

 EFIAPI

 StartPerformanceMeasurement (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp

   )

 {

@@ -1262,9 +1262,9 @@ StartPerformanceMeasurement (
 RETURN_STATUS

 EFIAPI

 EndPerformanceMeasurement (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp

   )

 {

@@ -1366,9 +1366,9 @@ RETURN_STATUS
 EFIAPI

 LogPerformanceMeasurement (

   IN CONST VOID   *CallerIdentifier,

-  IN CONST VOID   *Guid,    OPTIONAL

-  IN CONST CHAR8  *String,  OPTIONAL

-  IN UINT64       Address, OPTIONAL

+  IN CONST VOID   *Guid     OPTIONAL,

+  IN CONST CHAR8  *String   OPTIONAL,

+  IN UINT64       Address  OPTIONAL,

   IN UINT32       Identifier

   )

 {

@@ -1401,4 +1401,3 @@ LogPerformanceMeasurementEnabled (
   }

   return FALSE;

 }

-

diff --git a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLibInternal.h b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLibInternal.h
index 120ba506ad..c6963d2ebe 100644
--- a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLibInternal.h
+++ b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLibInternal.h
@@ -64,11 +64,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 EFI_STATUS

 EFIAPI

 CreatePerformanceMeasurement(

-  IN CONST VOID                        *CallerIdentifier, OPTIONAL

-  IN CONST VOID                        *Guid,     OPTIONAL

-  IN CONST CHAR8                       *String,   OPTIONAL

-  IN       UINT64                      TimeStamp, OPTIONAL

-  IN       UINT64                      Address,   OPTIONAL

+  IN CONST VOID                        *CallerIdentifier  OPTIONAL,

+  IN CONST VOID                        *Guid      OPTIONAL,

+  IN CONST CHAR8                       *String    OPTIONAL,

+  IN       UINT64                      TimeStamp  OPTIONAL,

+  IN       UINT64                      Address    OPTIONAL,

   IN       UINT32                      Identifier,

   IN       PERF_MEASUREMENT_ATTRIBUTE  Attribute

   );

diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c
index 2cbffe889e..3740b9863e 100644
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c
@@ -395,7 +395,7 @@ RETURN_STATUS
 EFIAPI

 RestoreLockBox (

   IN  GUID                        *Guid,

-  IN  VOID                        *Buffer, OPTIONAL

+  IN  VOID                        *Buffer  OPTIONAL,

   IN  OUT UINTN                   *Length  OPTIONAL

   )

 {

@@ -535,4 +535,3 @@ RestoreAllLockBoxInPlace (
   //

   return Status;

 }

-

diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxMmLib.c b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxMmLib.c
index a709851806..7f7ab10427 100644
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxMmLib.c
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxMmLib.c
@@ -725,7 +725,7 @@ RETURN_STATUS
 EFIAPI

 RestoreLockBox (

   IN  GUID                        *Guid,

-  IN  VOID                        *Buffer, OPTIONAL

+  IN  VOID                        *Buffer  OPTIONAL,

   IN  OUT UINTN                   *Length  OPTIONAL

   )

 {

@@ -858,4 +858,3 @@ RestoreAllLockBoxInPlace (
   DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreAllLockBoxInPlace - Exit (%r)\n", EFI_SUCCESS));

   return EFI_SUCCESS;

 }

-

diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c
index fe1059d8fe..2dfbfc92a5 100644
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c
@@ -238,7 +238,7 @@ InternalGetSmmLockBoxContext (
 EFI_STATUS

 InternalRestoreLockBoxFromSmram (

   IN  GUID                        *Guid,

-  IN  VOID                        *Buffer, OPTIONAL

+  IN  VOID                        *Buffer  OPTIONAL,

   IN  OUT UINTN                   *Length  OPTIONAL

   )

 {

@@ -517,7 +517,7 @@ RETURN_STATUS
 EFIAPI

 RestoreLockBox (

   IN  GUID                        *Guid,

-  IN  VOID                        *Buffer, OPTIONAL

+  IN  VOID                        *Buffer  OPTIONAL,

   IN  OUT UINTN                   *Length  OPTIONAL

   )

 {

@@ -739,4 +739,3 @@ RestoreAllLockBoxInPlace (
   //

   return Status;

 }

-

diff --git a/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.c b/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.c
index 797d72f67e..c3fa79b2de 100644
--- a/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.c
+++ b/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.c
@@ -105,9 +105,9 @@ GetPerformanceMeasurementProtocol (
 RETURN_STATUS

 EFIAPI

 StartPerformanceMeasurementEx (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp,

   IN UINT32       Identifier

   )

@@ -164,9 +164,9 @@ StartPerformanceMeasurementEx (
 RETURN_STATUS

 EFIAPI

 EndPerformanceMeasurementEx (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp,

   IN UINT32       Identifier

   )

@@ -275,9 +275,9 @@ GetPerformanceMeasurementEx (
 RETURN_STATUS

 EFIAPI

 StartPerformanceMeasurement (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp

   )

 {

@@ -309,9 +309,9 @@ StartPerformanceMeasurement (
 RETURN_STATUS

 EFIAPI

 EndPerformanceMeasurement (

-  IN CONST VOID   *Handle,  OPTIONAL

-  IN CONST CHAR8  *Token,   OPTIONAL

-  IN CONST CHAR8  *Module,  OPTIONAL

+  IN CONST VOID   *Handle   OPTIONAL,

+  IN CONST CHAR8  *Token    OPTIONAL,

+  IN CONST CHAR8  *Module   OPTIONAL,

   IN UINT64       TimeStamp

   )

 {

@@ -411,9 +411,9 @@ RETURN_STATUS
 EFIAPI

 LogPerformanceMeasurement (

   IN CONST VOID   *CallerIdentifier,

-  IN CONST VOID   *Guid,    OPTIONAL

-  IN CONST CHAR8  *String,  OPTIONAL

-  IN UINT64       Address, OPTIONAL

+  IN CONST VOID   *Guid     OPTIONAL,

+  IN CONST CHAR8  *String   OPTIONAL,

+  IN UINT64       Address  OPTIONAL,

   IN UINT32       Identifier

   )

 {

diff --git a/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLib.h b/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLib.h
index 2820e40dde..118e89a7b4 100644
--- a/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLib.h
+++ b/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLib.h
@@ -29,7 +29,7 @@
 EFI_STATUS

 InternalLocateProtocol (

   IN  EFI_GUID  *Protocol,

-  IN  VOID      *Registration, OPTIONAL

+  IN  VOID      *Registration  OPTIONAL,

   OUT VOID      **Interface

   );

 

diff --git a/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLibStandaloneMm.c b/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLibStandaloneMm.c
index a4c428dc88..d69bf8e06e 100644
--- a/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLibStandaloneMm.c
+++ b/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLibStandaloneMm.c
@@ -30,7 +30,7 @@
 EFI_STATUS

 InternalLocateProtocol (

   IN  EFI_GUID  *Protocol,

-  IN  VOID      *Registration, OPTIONAL

+  IN  VOID      *Registration  OPTIONAL,

   OUT VOID      **Interface

   )

 {

diff --git a/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLibTraditional.c b/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLibTraditional.c
index 603e222f55..e0c87f5627 100644
--- a/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLibTraditional.c
+++ b/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLibTraditional.c
@@ -30,7 +30,7 @@
 EFI_STATUS

 InternalLocateProtocol (

   IN  EFI_GUID  *Protocol,

-  IN  VOID      *Registration, OPTIONAL

+  IN  VOID      *Registration  OPTIONAL,

   OUT VOID      **Interface

   )

 {

diff --git a/MdeModulePkg/Library/SmmSmiHandlerProfileLib/MmSmiHandlerProfileLib.c b/MdeModulePkg/Library/SmmSmiHandlerProfileLib/MmSmiHandlerProfileLib.c
index f800220b54..25a0ccb49d 100644
--- a/MdeModulePkg/Library/SmmSmiHandlerProfileLib/MmSmiHandlerProfileLib.c
+++ b/MdeModulePkg/Library/SmmSmiHandlerProfileLib/MmSmiHandlerProfileLib.c
@@ -40,7 +40,7 @@ SmiHandlerProfileRegisterHandler (
   IN EFI_GUID                       *HandlerGuid,

   IN EFI_SMM_HANDLER_ENTRY_POINT2   Handler,

   IN PHYSICAL_ADDRESS               CallerAddress,

-  IN VOID                           *Context, OPTIONAL

+  IN VOID                           *Context  OPTIONAL,

   IN UINTN                          ContextSize OPTIONAL

   )

 {

@@ -72,7 +72,7 @@ EFIAPI
 SmiHandlerProfileUnregisterHandler (

   IN EFI_GUID                       *HandlerGuid,

   IN EFI_SMM_HANDLER_ENTRY_POINT2   Handler,

-  IN VOID                           *Context, OPTIONAL

+  IN VOID                           *Context  OPTIONAL,

   IN UINTN                          ContextSize OPTIONAL

   )

 {

@@ -99,4 +99,3 @@ MmSmiHandlerProfileLibInitialization (
            );

   return EFI_SUCCESS;

 }

-

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c b/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
index 332a967d37..2a850f2953 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
@@ -192,7 +192,7 @@ BmGetSingleControllerHealthStatus (
   IN OUT EFI_BOOT_MANAGER_DRIVER_HEALTH_INFO **DriverHealthInfo,

   IN OUT UINTN                               *Count,

   IN  EFI_HANDLE                             DriverHealthHandle,

-  IN  EFI_HANDLE                             ControllerHandle,  OPTIONAL

+  IN  EFI_HANDLE                             ControllerHandle   OPTIONAL,

   IN  EFI_HANDLE                             ChildHandle        OPTIONAL

   )

 {

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c b/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c
index 25da95b669..9dd3c56617 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c
@@ -942,7 +942,7 @@ EfiBootManagerStartHotkeyService (
 EFI_STATUS

 EFIAPI

 EfiBootManagerAddKeyOptionVariable (

-  OUT EFI_BOOT_MANAGER_KEY_OPTION *AddedOption,   OPTIONAL

+  OUT EFI_BOOT_MANAGER_KEY_OPTION *AddedOption    OPTIONAL,

   IN UINT16                       BootOptionNumber,

   IN UINT32                       Modifier,

   ...

@@ -1053,7 +1053,7 @@ EfiBootManagerAddKeyOptionVariable (
 EFI_STATUS

 EFIAPI

 EfiBootManagerDeleteKeyOptionVariable (

-  IN EFI_BOOT_MANAGER_KEY_OPTION *DeletedOption, OPTIONAL

+  IN EFI_BOOT_MANAGER_KEY_OPTION *DeletedOption  OPTIONAL,

   IN UINT32                      Modifier,

   ...

   )

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
index 30a6c840aa..de9dde2d3d 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
@@ -476,7 +476,7 @@ EfiBootManagerInitializeLoadOption (
   IN  UINT32                            Attributes,

   IN  CHAR16                            *Description,

   IN  EFI_DEVICE_PATH_PROTOCOL          *FilePath,

-  IN  UINT8                             *OptionalData,   OPTIONAL

+  IN  UINT8                             *OptionalData    OPTIONAL,

   IN  UINT32                            OptionalDataSize

   )

 {

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
index 57602828fe..6cca1ba1d6 100644
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
@@ -603,8 +603,8 @@ InternalHiiBlockToConfig (
 EFI_STRING

 EFIAPI

 InternalHiiBrowserCallback (

-  IN CONST EFI_GUID    *VariableGuid,  OPTIONAL

-  IN CONST CHAR16      *VariableName,  OPTIONAL

+  IN CONST EFI_GUID    *VariableGuid   OPTIONAL,

+  IN CONST CHAR16      *VariableName   OPTIONAL,

   IN CONST EFI_STRING  SetResultsData  OPTIONAL

   )

 {

@@ -713,8 +713,8 @@ InternalHiiBrowserCallback (
 EFI_STRING

 EFIAPI

 HiiConstructConfigHdr (

-  IN CONST EFI_GUID  *Guid,  OPTIONAL

-  IN CONST CHAR16    *Name,  OPTIONAL

+  IN CONST EFI_GUID  *Guid   OPTIONAL,

+  IN CONST CHAR16    *Name   OPTIONAL,

   IN EFI_HANDLE      DriverHandle

   )

 {

@@ -2241,7 +2241,7 @@ GetElementsFromRequest (
 BOOLEAN

 EFIAPI

 InternalHiiIfrValueAction (

-  IN CONST EFI_STRING Request,  OPTIONAL

+  IN CONST EFI_STRING Request   OPTIONAL,

   IN UINT16           DefaultId,

   IN UINT8            ActionType

   )

@@ -2636,7 +2636,7 @@ HiiValidateSettings (
 BOOLEAN

 EFIAPI

 HiiSetToDefaults (

-  IN CONST EFI_STRING Request,  OPTIONAL

+  IN CONST EFI_STRING Request   OPTIONAL,

   IN UINT16        DefaultId

   )

 {

@@ -2736,7 +2736,7 @@ BOOLEAN
 EFIAPI

 HiiIsConfigHdrMatch (

   IN CONST EFI_STRING  ConfigHdr,

-  IN CONST EFI_GUID    *Guid,     OPTIONAL

+  IN CONST EFI_GUID    *Guid      OPTIONAL,

   IN CONST CHAR16      *Name      OPTIONAL

   )

 {

@@ -2794,8 +2794,8 @@ HiiIsConfigHdrMatch (
 BOOLEAN

 EFIAPI

 HiiGetBrowserData (

-  IN CONST EFI_GUID  *VariableGuid,  OPTIONAL

-  IN CONST CHAR16    *VariableName,  OPTIONAL

+  IN CONST EFI_GUID  *VariableGuid   OPTIONAL,

+  IN CONST CHAR16    *VariableName   OPTIONAL,

   IN UINTN           BufferSize,

   OUT UINT8          *Buffer

   )

@@ -2876,8 +2876,8 @@ HiiGetBrowserData (
 BOOLEAN

 EFIAPI

 HiiSetBrowserData (

-  IN CONST EFI_GUID  *VariableGuid, OPTIONAL

-  IN CONST CHAR16    *VariableName, OPTIONAL

+  IN CONST EFI_GUID  *VariableGuid  OPTIONAL,

+  IN CONST CHAR16    *VariableName  OPTIONAL,

   IN UINTN           BufferSize,

   IN CONST UINT8     *Buffer,

   IN CONST CHAR16    *RequestElement  OPTIONAL

@@ -3330,7 +3330,7 @@ EFIAPI
 HiiCreateGuidOpCode (

   IN VOID            *OpCodeHandle,

   IN CONST EFI_GUID  *Guid,

-  IN CONST VOID      *GuidOpCode,    OPTIONAL

+  IN CONST VOID      *GuidOpCode     OPTIONAL,

   IN UINTN           OpCodeSize

   )

 {

@@ -3528,7 +3528,7 @@ HiiCreateGotoExOpCode (
   IN UINT8            QuestionFlags,

   IN EFI_QUESTION_ID  QuestionId,

   IN EFI_QUESTION_ID  RefQuestionId,

-  IN EFI_GUID         *RefFormSetId,    OPTIONAL

+  IN EFI_GUID         *RefFormSetId     OPTIONAL,

   IN EFI_STRING_ID    RefDevicePath

   )

 {

@@ -3997,8 +3997,8 @@ EFIAPI
 HiiCreateDateOpCode (

   IN VOID             *OpCodeHandle,

   IN EFI_QUESTION_ID  QuestionId,

-  IN EFI_VARSTORE_ID  VarStoreId,   OPTIONAL

-  IN UINT16           VarOffset,    OPTIONAL

+  IN EFI_VARSTORE_ID  VarStoreId    OPTIONAL,

+  IN UINT16           VarOffset     OPTIONAL,

   IN EFI_STRING_ID    Prompt,

   IN EFI_STRING_ID    Help,

   IN UINT8            QuestionFlags,

@@ -4062,8 +4062,8 @@ EFIAPI
 HiiCreateTimeOpCode (

   IN VOID             *OpCodeHandle,

   IN EFI_QUESTION_ID  QuestionId,

-  IN EFI_VARSTORE_ID  VarStoreId,   OPTIONAL

-  IN UINT16           VarOffset,    OPTIONAL

+  IN EFI_VARSTORE_ID  VarStoreId    OPTIONAL,

+  IN UINT16           VarOffset     OPTIONAL,

   IN EFI_STRING_ID    Prompt,

   IN EFI_STRING_ID    Help,

   IN UINT8            QuestionFlags,

@@ -4117,11 +4117,11 @@ HiiCreateTimeOpCode (
 EFI_STATUS

 EFIAPI

 InternalHiiUpdateFormPackageData (

-  IN  EFI_GUID               *FormSetGuid, OPTIONAL

+  IN  EFI_GUID               *FormSetGuid  OPTIONAL,

   IN  EFI_FORM_ID            FormId,

   IN  EFI_HII_PACKAGE_HEADER *Package,

   IN  HII_LIB_OPCODE_BUFFER  *OpCodeBufferStart,

-  IN  HII_LIB_OPCODE_BUFFER  *OpCodeBufferEnd,    OPTIONAL

+  IN  HII_LIB_OPCODE_BUFFER  *OpCodeBufferEnd     OPTIONAL,

   OUT EFI_HII_PACKAGE_HEADER *TempPackage

   )

 {

@@ -4321,7 +4321,7 @@ EFI_STATUS
 EFIAPI

 HiiUpdateForm (

   IN EFI_HII_HANDLE  HiiHandle,

-  IN EFI_GUID        *FormSetGuid,        OPTIONAL

+  IN EFI_GUID        *FormSetGuid         OPTIONAL,

   IN EFI_FORM_ID     FormId,

   IN VOID            *StartOpCodeHandle,

   IN VOID            *EndOpCodeHandle     OPTIONAL

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiString.c b/MdeModulePkg/Library/UefiHiiLib/HiiString.c
index 48f6d6881d..078811e835 100644
--- a/MdeModulePkg/Library/UefiHiiLib/HiiString.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiString.c
@@ -52,7 +52,7 @@ EFI_STRING_ID
 EFIAPI

 HiiSetString (

   IN EFI_HII_HANDLE    HiiHandle,

-  IN EFI_STRING_ID     StringId,            OPTIONAL

+  IN EFI_STRING_ID     StringId             OPTIONAL,

   IN CONST EFI_STRING  String,

   IN CONST CHAR8       *SupportedLanguages  OPTIONAL

   )

@@ -392,4 +392,3 @@ Error:
   //

   return String;

 }

-