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>

27 files changed, 84 insertions, 93 deletions

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
index f26d2adb81..ccfd39cc79 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
@@ -1860,7 +1860,7 @@ EFI_STATUS
 EFIAPI

 ConSplitterGraphicsOutputBlt (

   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL                  *This,

-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL                 *BltBuffer, OPTIONAL

+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL                 *BltBuffer  OPTIONAL,

   IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION             BltOperation,

   IN  UINTN                                         SourceX,

   IN  UINTN                                         SourceY,

@@ -1973,7 +1973,7 @@ EFI_STATUS
 EFIAPI

 ConSplitterUgaDrawBlt (

   IN  EFI_UGA_DRAW_PROTOCOL                         *This,

-  IN  EFI_UGA_PIXEL                                 *BltBuffer, OPTIONAL

+  IN  EFI_UGA_PIXEL                                 *BltBuffer  OPTIONAL,

   IN  EFI_UGA_BLT_OPERATION                         BltOperation,

   IN  UINTN                                         SourceX,

   IN  UINTN                                         SourceY,

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
index 9323f31b63..9fcf3e91c3 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
@@ -246,7 +246,7 @@ EFI_STATUS
 EFIAPI

 ConSplitterGraphicsOutputBlt (

   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL                  *This,

-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL                 *BltBuffer, OPTIONAL

+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL                 *BltBuffer  OPTIONAL,

   IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION             BltOperation,

   IN  UINTN                                         SourceX,

   IN  UINTN                                         SourceY,

@@ -520,7 +520,7 @@ EFI_STATUS
 EFIAPI

 ConSplitterUgaDrawBlt (

   IN  EFI_UGA_DRAW_PROTOCOL                         *This,

-  IN  EFI_UGA_PIXEL                                 *BltBuffer, OPTIONAL

+  IN  EFI_UGA_PIXEL                                 *BltBuffer  OPTIONAL,

   IN  EFI_UGA_BLT_OPERATION                         BltOperation,

   IN  UINTN                                         SourceX,

   IN  UINTN                                         SourceY,

diff --git a/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.c b/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.c
index ef82daebed..84172c1464 100644
--- a/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.c
+++ b/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.c
@@ -133,7 +133,7 @@ EFI_STATUS
 EFIAPI

 GraphicsOutputBlt (

   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL      *This,

-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL     *BltBuffer, OPTIONAL

+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL     *BltBuffer  OPTIONAL,

   IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation,

   IN  UINTN                             SourceX,

   IN  UINTN                             SourceY,

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
index 360e58e847..dfe9882b43 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
@@ -1379,7 +1379,7 @@ Utf8ToUnicode (
 BOOLEAN

 TerminalIsValidTextGraphics (

   IN  CHAR16  Graphic,

-  OUT CHAR8   *PcAnsi, OPTIONAL

+  OUT CHAR8   *PcAnsi  OPTIONAL,

   OUT CHAR8   *Ascii OPTIONAL

   );

 

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
index aae470e956..49596773e1 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
@@ -874,7 +874,7 @@ TerminalConOutEnableCursor (
 BOOLEAN

 TerminalIsValidTextGraphics (

   IN  CHAR16  Graphic,

-  OUT CHAR8   *PcAnsi, OPTIONAL

+  OUT CHAR8   *PcAnsi  OPTIONAL,

   OUT CHAR8   *Ascii OPTIONAL

   )

 {

diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c
index 235db92969..bc43d92e4e 100644
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c
@@ -458,7 +458,7 @@ DiskIoCreateSubtask (
   IN UINT64           Lba,

   IN UINT32           Offset,

   IN UINTN            Length,

-  IN VOID             *WorkingBuffer,  OPTIONAL

+  IN VOID             *WorkingBuffer   OPTIONAL,

   IN VOID             *Buffer,

   IN BOOLEAN          Blocking

   )

diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.c b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.c
index a873f0ae2f..4a4076057b 100644
--- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.c
+++ b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.c
@@ -630,10 +630,10 @@ DriverHealthManagerGetFormsetId (
 VOID

 DriverHealthManagerProcessSingleControllerHealth (

   IN  EFI_DRIVER_HEALTH_PROTOCOL         *DriverHealth,

-  IN  EFI_HANDLE                         ControllerHandle, OPTIONAL

-  IN  EFI_HANDLE                         ChildHandle,      OPTIONAL

+  IN  EFI_HANDLE                         ControllerHandle  OPTIONAL,

+  IN  EFI_HANDLE                         ChildHandle       OPTIONAL,

   IN  EFI_DRIVER_HEALTH_STATUS           HealthStatus,

-  IN  EFI_DRIVER_HEALTH_HII_MESSAGE      **MessageList,    OPTIONAL

+  IN  EFI_DRIVER_HEALTH_HII_MESSAGE      **MessageList     OPTIONAL,

   IN  EFI_HII_HANDLE                     FormHiiHandle

   )

 {

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
index 3dfa8bf41f..69bff5148e 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
@@ -3114,8 +3114,8 @@ EFI_STATUS
 EFIAPI

 EfiConfigKeywordHandlerGetData (

   IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL  *This,

-  IN CONST EFI_STRING                     NameSpaceId, OPTIONAL

-  IN CONST EFI_STRING                     KeywordString, OPTIONAL

+  IN CONST EFI_STRING                     NameSpaceId  OPTIONAL,

+  IN CONST EFI_STRING                     KeywordString  OPTIONAL,

   OUT EFI_STRING                          *Progress,

   OUT UINT32                              *ProgressErr,

   OUT EFI_STRING                          *Results

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
index 174770bdbb..7835802d3f 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
@@ -3479,7 +3479,7 @@ EFIAPI
 HiiNewPackageList (

   IN CONST EFI_HII_DATABASE_PROTOCOL    *This,

   IN CONST EFI_HII_PACKAGE_LIST_HEADER  *PackageList,

-  IN CONST EFI_HANDLE                   DriverHandle, OPTIONAL

+  IN CONST EFI_HANDLE                   DriverHandle  OPTIONAL,

   OUT EFI_HII_HANDLE                    *Handle

   )

 {

@@ -4629,4 +4629,3 @@ HiiGetPackageListHandle (
 

   return EFI_NOT_FOUND;

 }

-

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
index ee6c65287d..3629b249ca 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
@@ -603,8 +603,8 @@ WriteOutputParam (
   IN  UINT8                          *BufferIn,

   IN  UINTN                          BufferLen,

   IN  EFI_HII_GLYPH_INFO             *InputCell,

-  OUT UINT8                          **GlyphBuffer, OPTIONAL

-  OUT EFI_HII_GLYPH_INFO             *Cell, OPTIONAL

+  OUT UINT8                          **GlyphBuffer  OPTIONAL,

+  OUT EFI_HII_GLYPH_INFO             *Cell  OPTIONAL,

   OUT UINTN                          *GlyphBufferLen OPTIONAL

   )

 {

@@ -657,8 +657,8 @@ EFI_STATUS
 FindGlyphBlock (

   IN  HII_FONT_PACKAGE_INSTANCE      *FontPackage,

   IN  CHAR16                         CharValue,

-  OUT UINT8                          **GlyphBuffer, OPTIONAL

-  OUT EFI_HII_GLYPH_INFO             *Cell, OPTIONAL

+  OUT UINT8                          **GlyphBuffer  OPTIONAL,

+  OUT EFI_HII_GLYPH_INFO             *Cell  OPTIONAL,

   OUT UINTN                          *GlyphBufferLen OPTIONAL

   )

 {

@@ -1036,7 +1036,7 @@ BOOLEAN
 IsSystemFontInfo (

   IN  HII_DATABASE_PRIVATE_DATA      *Private,

   IN  EFI_FONT_DISPLAY_INFO          *StringInfo,

-  OUT EFI_FONT_DISPLAY_INFO          **SystemInfo, OPTIONAL

+  OUT EFI_FONT_DISPLAY_INFO          **SystemInfo  OPTIONAL,

   OUT UINTN                          *SystemInfoLen OPTIONAL

   )

 {

@@ -1149,8 +1149,8 @@ BOOLEAN
 IsFontInfoExisted (

   IN  HII_DATABASE_PRIVATE_DATA *Private,

   IN  EFI_FONT_INFO             *FontInfo,

-  IN  EFI_FONT_INFO_MASK        *FontInfoMask,   OPTIONAL

-  IN  EFI_FONT_HANDLE           FontHandle,      OPTIONAL

+  IN  EFI_FONT_INFO_MASK        *FontInfoMask    OPTIONAL,

+  IN  EFI_FONT_HANDLE           FontHandle       OPTIONAL,

   OUT HII_GLOBAL_FONT_INFO      **GlobalFontInfo OPTIONAL

   )

 {

@@ -2729,7 +2729,7 @@ EFIAPI
 HiiGetFontInfo (

   IN  CONST EFI_HII_FONT_PROTOCOL    *This,

   IN  OUT   EFI_FONT_HANDLE          *FontHandle,

-  IN  CONST EFI_FONT_DISPLAY_INFO    *StringInfoIn, OPTIONAL

+  IN  CONST EFI_FONT_DISPLAY_INFO    *StringInfoIn  OPTIONAL,

   OUT       EFI_FONT_DISPLAY_INFO    **StringInfoOut,

   IN  CONST EFI_STRING               String OPTIONAL

   )

@@ -2900,5 +2900,3 @@ Exit:
   }

   return Status;

 }

-

-

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
index 4a3feab94d..363fef5c23 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
@@ -448,8 +448,8 @@ BOOLEAN
 IsFontInfoExisted (

   IN  HII_DATABASE_PRIVATE_DATA *Private,

   IN  EFI_FONT_INFO             *FontInfo,

-  IN  EFI_FONT_INFO_MASK        *FontInfoMask,   OPTIONAL

-  IN  EFI_FONT_HANDLE           FontHandle,      OPTIONAL

+  IN  EFI_FONT_INFO_MASK        *FontInfoMask    OPTIONAL,

+  IN  EFI_FONT_HANDLE           FontHandle       OPTIONAL,

   OUT HII_GLOBAL_FONT_INFO      **GlobalFontInfo OPTIONAL

   );

 

@@ -532,10 +532,10 @@ FindStringBlock (
   IN HII_DATABASE_PRIVATE_DATA        *Private,

   IN  HII_STRING_PACKAGE_INSTANCE     *StringPackage,

   IN  EFI_STRING_ID                   StringId,

-  OUT UINT8                           *BlockType, OPTIONAL

-  OUT UINT8                           **StringBlockAddr, OPTIONAL

-  OUT UINTN                           *StringTextOffset, OPTIONAL

-  OUT EFI_STRING_ID                   *LastStringId, OPTIONAL

+  OUT UINT8                           *BlockType  OPTIONAL,

+  OUT UINT8                           **StringBlockAddr  OPTIONAL,

+  OUT UINTN                           *StringTextOffset  OPTIONAL,

+  OUT EFI_STRING_ID                   *LastStringId  OPTIONAL,

   OUT EFI_STRING_ID                   *StartStringId OPTIONAL

   );

 

@@ -565,8 +565,8 @@ EFI_STATUS
 FindGlyphBlock (

   IN  HII_FONT_PACKAGE_INSTANCE      *FontPackage,

   IN  CHAR16                         CharValue,

-  OUT UINT8                          **GlyphBuffer, OPTIONAL

-  OUT EFI_HII_GLYPH_INFO             *Cell, OPTIONAL

+  OUT UINT8                          **GlyphBuffer  OPTIONAL,

+  OUT EFI_HII_GLYPH_INFO             *Cell  OPTIONAL,

   OUT UINTN                          *GlyphBufferLen OPTIONAL

   );

 

@@ -821,7 +821,7 @@ EFIAPI
 HiiGetFontInfo (

   IN  CONST EFI_HII_FONT_PROTOCOL    *This,

   IN  OUT   EFI_FONT_HANDLE          *FontHandle,

-  IN  CONST EFI_FONT_DISPLAY_INFO    *StringInfoIn, OPTIONAL

+  IN  CONST EFI_FONT_DISPLAY_INFO    *StringInfoIn  OPTIONAL,

   OUT       EFI_FONT_DISPLAY_INFO    **StringInfoOut,

   IN  CONST EFI_STRING               String OPTIONAL

   );

@@ -1327,7 +1327,7 @@ HiiNewString (
   IN  EFI_HII_HANDLE                  PackageList,

   OUT EFI_STRING_ID                   *StringId,

   IN  CONST CHAR8                     *Language,

-  IN  CONST CHAR16                    *LanguageName, OPTIONAL

+  IN  CONST CHAR16                    *LanguageName  OPTIONAL,

   IN  CONST EFI_STRING                String,

   IN  CONST EFI_FONT_INFO             *StringFontInfo OPTIONAL

   );

@@ -1524,7 +1524,7 @@ EFIAPI
 HiiNewPackageList (

   IN CONST EFI_HII_DATABASE_PROTOCOL    *This,

   IN CONST EFI_HII_PACKAGE_LIST_HEADER  *PackageList,

-  IN CONST EFI_HANDLE                   DriverHandle, OPTIONAL

+  IN CONST EFI_HANDLE                   DriverHandle  OPTIONAL,

   OUT EFI_HII_HANDLE                    *Handle

   );

 

@@ -2268,8 +2268,8 @@ EFI_STATUS
 EFIAPI

 EfiConfigKeywordHandlerGetData (

   IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL  *This,

-  IN CONST EFI_STRING                     NameSpaceId, OPTIONAL

-  IN CONST EFI_STRING                     KeywordString, OPTIONAL

+  IN CONST EFI_STRING                     NameSpaceId  OPTIONAL,

+  IN CONST EFI_STRING                     KeywordString  OPTIONAL,

   OUT EFI_STRING                          *Progress,

   OUT UINT32                              *ProgressErr,

   OUT EFI_STRING                          *Results

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c b/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
index 2c7ecfea40..43e3b360cb 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
@@ -152,7 +152,7 @@ ConvertToUnicodeText (
 **/

 EFI_STATUS

 GetUnicodeStringTextOrSize (

-  OUT EFI_STRING       StringDest, OPTIONAL

+  OUT EFI_STRING       StringDest  OPTIONAL,

   IN  UINT8            *StringSrc,

   IN  OUT UINTN        *BufferSize

   )

@@ -258,10 +258,10 @@ FindStringBlock (
   IN HII_DATABASE_PRIVATE_DATA        *Private,

   IN  HII_STRING_PACKAGE_INSTANCE     *StringPackage,

   IN  EFI_STRING_ID                   StringId,

-  OUT UINT8                           *BlockType, OPTIONAL

-  OUT UINT8                           **StringBlockAddr, OPTIONAL

-  OUT UINTN                           *StringTextOffset, OPTIONAL

-  OUT EFI_STRING_ID                   *LastStringId, OPTIONAL

+  OUT UINT8                           *BlockType  OPTIONAL,

+  OUT UINT8                           **StringBlockAddr  OPTIONAL,

+  OUT UINTN                           *StringTextOffset  OPTIONAL,

+  OUT EFI_STRING_ID                   *LastStringId  OPTIONAL,

   OUT EFI_STRING_ID                   *StartStringId OPTIONAL

   )

 {

@@ -612,7 +612,7 @@ GetStringWorker (
   IN  HII_STRING_PACKAGE_INSTANCE     *StringPackage,

   IN  EFI_STRING_ID                   StringId,

   OUT EFI_STRING                      String,

-  IN  OUT UINTN                       *StringSize, OPTIONAL

+  IN  OUT UINTN                       *StringSize  OPTIONAL,

   OUT EFI_FONT_INFO                   **StringFontInfo OPTIONAL

   )

 {

@@ -1143,7 +1143,7 @@ HiiNewString (
   IN  EFI_HII_HANDLE                  PackageList,

   OUT EFI_STRING_ID                   *StringId,

   IN  CONST CHAR8                     *Language,

-  IN  CONST CHAR16                    *LanguageName, OPTIONAL

+  IN  CONST CHAR16                    *LanguageName  OPTIONAL,

   IN  CONST EFI_STRING                String,

   IN  CONST EFI_FONT_INFO             *StringFontInfo OPTIONAL

   )

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
index cdb9b4fac1..2a9135b212 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -1044,7 +1044,7 @@ DxePcdSetBoolEx (
 EFI_STATUS

 EFIAPI

 DxeRegisterCallBackOnSet (

-  IN  CONST EFI_GUID          *Guid, OPTIONAL

+  IN  CONST EFI_GUID          *Guid  OPTIONAL,

   IN  UINTN                   TokenNumber,

   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction

   )

@@ -1081,7 +1081,7 @@ DxeRegisterCallBackOnSet (
 EFI_STATUS

 EFIAPI

 DxeUnRegisterCallBackOnSet (

-  IN  CONST EFI_GUID          *Guid, OPTIONAL

+  IN  CONST EFI_GUID          *Guid  OPTIONAL,

   IN  UINTN                   TokenNumber,

   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction

   )

@@ -1133,7 +1133,7 @@ DxeUnRegisterCallBackOnSet (
 EFI_STATUS

 EFIAPI

 DxePcdGetNextToken (

-  IN CONST EFI_GUID         *Guid, OPTIONAL

+  IN CONST EFI_GUID         *Guid  OPTIONAL,

   IN OUT   UINTN            *TokenNumber

   )

 {

@@ -1374,5 +1374,3 @@ DxePcdGetNextTokenSpace (
 

   return EFI_NOT_FOUND;

 }

-

-

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c
index badeec8c97..9be7b663ae 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c
@@ -522,7 +522,7 @@ GetWorker (
 EFI_STATUS

 DxeRegisterCallBackWorker (

   IN  UINTN                   TokenNumber,

-  IN  CONST EFI_GUID          *Guid, OPTIONAL

+  IN  CONST EFI_GUID          *Guid  OPTIONAL,

   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction

 )

 {

@@ -581,7 +581,7 @@ DxeRegisterCallBackWorker (
 EFI_STATUS

 DxeUnRegisterCallBackWorker (

   IN  UINTN                   TokenNumber,

-  IN  CONST EFI_GUID          *Guid, OPTIONAL

+  IN  CONST EFI_GUID          *Guid  OPTIONAL,

   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction

 )

 {

@@ -1018,7 +1018,7 @@ GetHiiVariable (
 VOID

 InvokeCallbackOnSet (

   UINT32            ExTokenNumber,

-  CONST EFI_GUID    *Guid, OPTIONAL

+  CONST EFI_GUID    *Guid  OPTIONAL,

   UINTN             TokenNumber,

   VOID              *Data,

   UINTN             Size

@@ -1899,4 +1899,3 @@ VariableLockCallBack (
     VariableLockDynamicHiiPcd (FALSE, VariableLock);

   }

 }

-

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/MdeModulePkg/Universal/PCD/Dxe/Service.h
index 6109458ca9..5cf13cbad5 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.h
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.h
@@ -724,7 +724,7 @@ DxePcdSetBoolEx (
 EFI_STATUS

 EFIAPI

 DxeRegisterCallBackOnSet (

-  IN  CONST EFI_GUID          *Guid, OPTIONAL

+  IN  CONST EFI_GUID          *Guid  OPTIONAL,

   IN  UINTN                   TokenNumber,

   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction

   );

@@ -744,7 +744,7 @@ DxeRegisterCallBackOnSet (
 EFI_STATUS

 EFIAPI

 DxeUnRegisterCallBackOnSet (

-  IN  CONST EFI_GUID          *Guid, OPTIONAL

+  IN  CONST EFI_GUID          *Guid  OPTIONAL,

   IN  UINTN                   TokenNumber,

   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction

   );

@@ -780,7 +780,7 @@ DxeUnRegisterCallBackOnSet (
 EFI_STATUS

 EFIAPI

 DxePcdGetNextToken (

-  IN CONST EFI_GUID               *Guid, OPTIONAL

+  IN CONST EFI_GUID               *Guid  OPTIONAL,

   IN OUT   UINTN                  *TokenNumber

   );

 

@@ -1018,7 +1018,7 @@ SetHiiVariable (
 EFI_STATUS

 DxeRegisterCallBackWorker (

   IN  UINTN                   TokenNumber,

-  IN  CONST EFI_GUID          *Guid, OPTIONAL

+  IN  CONST EFI_GUID          *Guid  OPTIONAL,

   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction

   );

 

@@ -1039,7 +1039,7 @@ DxeRegisterCallBackWorker (
 EFI_STATUS

 DxeUnRegisterCallBackWorker (

   IN  UINTN                   TokenNumber,

-  IN  CONST EFI_GUID          *Guid, OPTIONAL

+  IN  CONST EFI_GUID          *Guid  OPTIONAL,

   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction

   );

 

@@ -1192,4 +1192,3 @@ extern  UINTN          TmpTokenSpaceBufferCount;
 extern EFI_LOCK mPcdDatabaseLock;

 

 #endif

-

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
index f31e0be35f..1e418bcbae 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
@@ -138,7 +138,7 @@ EFI_PEI_PPI_DESCRIPTOR  mPpiList2[] = {
 VOID

 EFIAPI

 PcdSetNvStoreDefaultIdCallBack (

-  IN CONST EFI_GUID         *CallBackGuid, OPTIONAL

+  IN CONST EFI_GUID         *CallBackGuid  OPTIONAL,

   IN       UINTN            CallBackToken,

   IN OUT   VOID             *TokenData,

   IN       UINTN            TokenDataSize

@@ -1342,7 +1342,7 @@ PeiPcdSetBoolEx (
 EFI_STATUS

 EFIAPI

 PeiRegisterCallBackOnSet (

-  IN  CONST EFI_GUID              *Guid, OPTIONAL

+  IN  CONST EFI_GUID              *Guid  OPTIONAL,

   IN  UINTN                       ExTokenNumber,

   IN  PCD_PPI_CALLBACK            CallBackFunction

   )

@@ -1373,7 +1373,7 @@ PeiRegisterCallBackOnSet (
 EFI_STATUS

 EFIAPI

 PcdUnRegisterCallBackOnSet (

-  IN  CONST EFI_GUID              *Guid, OPTIONAL

+  IN  CONST EFI_GUID              *Guid  OPTIONAL,

   IN  UINTN                       ExTokenNumber,

   IN  PCD_PPI_CALLBACK            CallBackFunction

   )

@@ -1417,7 +1417,7 @@ PcdUnRegisterCallBackOnSet (
 EFI_STATUS

 EFIAPI

 PeiPcdGetNextToken (

-  IN CONST EFI_GUID               *Guid, OPTIONAL

+  IN CONST EFI_GUID               *Guid  OPTIONAL,

   IN OUT  UINTN                   *TokenNumber

   )

 {

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c
index 5b037353ad..a26e486711 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.c
@@ -298,7 +298,7 @@ PeiGetPcdInfo (
 EFI_STATUS

 PeiRegisterCallBackWorker (

   IN  UINTN                       ExTokenNumber,

-  IN  CONST EFI_GUID              *Guid, OPTIONAL

+  IN  CONST EFI_GUID              *Guid  OPTIONAL,

   IN  PCD_PPI_CALLBACK            CallBackFunction,

   IN  BOOLEAN                     Register

 )

@@ -529,7 +529,7 @@ GetHiiVariable (
 VOID

 InvokeCallbackOnSet (

   UINTN             ExTokenNumber,

-  CONST EFI_GUID    *Guid, OPTIONAL

+  CONST EFI_GUID    *Guid  OPTIONAL,

   UINTN             TokenNumber,

   VOID              *Data,

   UINTN             Size

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.h b/MdeModulePkg/Universal/PCD/Pei/Service.h
index 547094fe8a..a1f5781466 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.h
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.h
@@ -719,7 +719,7 @@ PeiPcdSetBoolEx (
 EFI_STATUS

 EFIAPI

 PeiRegisterCallBackOnSet (

-  IN  CONST EFI_GUID          *Guid, OPTIONAL

+  IN  CONST EFI_GUID          *Guid  OPTIONAL,

   IN  UINTN                   TokenNumber,

   IN  PCD_PPI_CALLBACK        CallBackFunction

   );

@@ -739,7 +739,7 @@ PeiRegisterCallBackOnSet (
 EFI_STATUS

 EFIAPI

 PcdUnRegisterCallBackOnSet (

-  IN  CONST EFI_GUID          *Guid, OPTIONAL

+  IN  CONST EFI_GUID          *Guid  OPTIONAL,

   IN  UINTN                   TokenNumber,

   IN  PCD_PPI_CALLBACK        CallBackFunction

   );

@@ -774,7 +774,7 @@ PcdUnRegisterCallBackOnSet (
 EFI_STATUS

 EFIAPI

 PeiPcdGetNextToken (

-  IN CONST EFI_GUID           *Guid, OPTIONAL

+  IN CONST EFI_GUID           *Guid  OPTIONAL,

   IN OUT  UINTN               *TokenNumber

   );

 

@@ -1004,7 +1004,7 @@ GetExPcdTokenNumber (
 EFI_STATUS

 PeiRegisterCallBackWorker (

   IN  UINTN              TokenNumber,

-  IN  CONST EFI_GUID         *Guid, OPTIONAL

+  IN  CONST EFI_GUID         *Guid  OPTIONAL,

   IN  PCD_PPI_CALLBACK   CallBackFunction,

   IN  BOOLEAN            Register

   );

@@ -1079,4 +1079,3 @@ SetPtrTypeSize (
   );

 

 #endif

-

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c
index d1324c135e..2334e8150f 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c
@@ -73,7 +73,7 @@ OnigurumaMatch (
   IN  CHAR16                *Pattern,

   IN  EFI_REGEX_SYNTAX_TYPE *SyntaxType,

   OUT BOOLEAN               *Result,

-  OUT EFI_REGEX_CAPTURE     **Captures,     OPTIONAL

+  OUT EFI_REGEX_CAPTURE     **Captures      OPTIONAL,

   OUT UINTN                 *CapturesCount

   )

 {

@@ -315,9 +315,9 @@ RegularExpressionMatch (
   IN  EFI_REGULAR_EXPRESSION_PROTOCOL *This,

   IN  CHAR16                          *String,

   IN  CHAR16                          *Pattern,

-  IN  EFI_REGEX_SYNTAX_TYPE           *SyntaxType, OPTIONAL

+  IN  EFI_REGEX_SYNTAX_TYPE           *SyntaxType  OPTIONAL,

   OUT BOOLEAN                         *Result,

-  OUT EFI_REGEX_CAPTURE               **Captures, OPTIONAL

+  OUT EFI_REGEX_CAPTURE               **Captures  OPTIONAL,

   OUT UINTN                           *CapturesCount

   )

 {

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h
index 3f046af363..a397e7799f 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h
@@ -76,9 +76,9 @@ RegularExpressionMatch (
   IN  EFI_REGULAR_EXPRESSION_PROTOCOL *This,

   IN  CHAR16                          *String,

   IN  CHAR16                          *Pattern,

-  IN  EFI_REGEX_SYNTAX_TYPE           *SyntaxType, OPTIONAL

+  IN  EFI_REGEX_SYNTAX_TYPE           *SyntaxType  OPTIONAL,

   OUT BOOLEAN                         *Result,

-  OUT EFI_REGEX_CAPTURE               **Captures, OPTIONAL

+  OUT EFI_REGEX_CAPTURE               **Captures  OPTIONAL,

   OUT UINTN                           *CapturesCount

   );

 

diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
index 79f98b28e5..d9c06b6cc1 100644
--- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
+++ b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
@@ -129,7 +129,7 @@ EFI_STATUS
 EFIAPI

 Security2StubAuthenticate (

   IN CONST EFI_SECURITY2_ARCH_PROTOCOL *This,

-  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/Universal/SetupBrowserDxe/Expression.c b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
index d273d2aac3..fa583caa38 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
@@ -3675,7 +3675,7 @@ EXPRESS_RESULT
 EvaluateExpressionList (

   IN FORM_EXPRESSION_LIST *ExpList,

   IN BOOLEAN              Evaluate,

-  IN FORM_BROWSER_FORMSET *FormSet, OPTIONAL

+  IN FORM_BROWSER_FORMSET *FormSet  OPTIONAL,

   IN FORM_BROWSER_FORM    *Form OPTIONAL

   )

 {

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h
index 51d0abf840..838804e949 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h
@@ -236,7 +236,7 @@ EXPRESS_RESULT
 EvaluateExpressionList (

   IN FORM_EXPRESSION_LIST *ExpList,

   IN BOOLEAN              Evaluate,

-  IN FORM_BROWSER_FORMSET *FormSet, OPTIONAL

+  IN FORM_BROWSER_FORMSET *FormSet  OPTIONAL,

   IN FORM_BROWSER_FORM    *Form OPTIONAL

   );

 

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index f936a4b8e8..d046472701 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -399,7 +399,7 @@ UINT32
 PopupErrorMessage (

   IN UINT32                BrowserStatus,

   IN EFI_HII_HANDLE        HiiHandle,

-  IN EFI_IFR_OP_HEADER     *OpCode, OPTIONAL

+  IN EFI_IFR_OP_HEADER     *OpCode  OPTIONAL,

   IN CHAR16                *ErrorString

   )

 {

@@ -469,9 +469,9 @@ SendForm (
   IN  CONST EFI_FORM_BROWSER2_PROTOCOL *This,

   IN  EFI_HII_HANDLE                   *Handles,

   IN  UINTN                            HandleCount,

-  IN  EFI_GUID                         *FormSetGuid, OPTIONAL

-  IN  UINT16                           FormId, OPTIONAL

-  IN  CONST EFI_SCREEN_DESCRIPTOR      *ScreenDimensions, OPTIONAL

+  IN  EFI_GUID                         *FormSetGuid  OPTIONAL,

+  IN  UINT16                           FormId  OPTIONAL,

+  IN  CONST EFI_SCREEN_DESCRIPTOR      *ScreenDimensions  OPTIONAL,

   OUT EFI_BROWSER_ACTION_REQUEST       *ActionRequest  OPTIONAL

   )

 {

@@ -730,7 +730,7 @@ BrowserCallback (
   IN OUT UINTN                         *ResultsDataSize,

   IN OUT EFI_STRING                    ResultsData,

   IN BOOLEAN                           RetrieveData,

-  IN CONST EFI_GUID                    *VariableGuid, OPTIONAL

+  IN CONST EFI_GUID                    *VariableGuid  OPTIONAL,

   IN CONST CHAR16                      *VariableName  OPTIONAL

   )

 {

@@ -6672,4 +6672,3 @@ IsResetRequired (
 {

   return gResetRequiredSystemLevel;

 }

-

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index 5d46fa42e0..54681fa5fc 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -1118,9 +1118,9 @@ SendForm (
   IN  CONST EFI_FORM_BROWSER2_PROTOCOL *This,

   IN  EFI_HII_HANDLE                   *Handles,

   IN  UINTN                            HandleCount,

-  IN  EFI_GUID                         *FormSetGuid, OPTIONAL

-  IN  UINT16                           FormId, OPTIONAL

-  IN  CONST EFI_SCREEN_DESCRIPTOR      *ScreenDimensions, OPTIONAL

+  IN  EFI_GUID                         *FormSetGuid  OPTIONAL,

+  IN  UINT16                           FormId  OPTIONAL,

+  IN  CONST EFI_SCREEN_DESCRIPTOR      *ScreenDimensions  OPTIONAL,

   OUT EFI_BROWSER_ACTION_REQUEST       *ActionRequest  OPTIONAL

   );

 

@@ -1158,7 +1158,7 @@ BrowserCallback (
   IN OUT UINTN                         *ResultsDataSize,

   IN OUT EFI_STRING                    ResultsData,

   IN BOOLEAN                           RetrieveData,

-  IN CONST EFI_GUID                    *VariableGuid, OPTIONAL

+  IN CONST EFI_GUID                    *VariableGuid  OPTIONAL,

   IN CONST CHAR16                      *VariableName  OPTIONAL

   );

 

@@ -1791,7 +1791,7 @@ UINT32
 PopupErrorMessage (

   IN UINT32                BrowserStatus,

   IN EFI_HII_HANDLE        HiiHandle,

-  IN EFI_IFR_OP_HEADER     *OpCode, OPTIONAL

+  IN EFI_IFR_OP_HEADER     *OpCode  OPTIONAL,

   IN CHAR16                *ErrorString

   );

 

diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
index 04c3dd34b1..804eedbf92 100644
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
+++ b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
@@ -356,7 +356,7 @@ EFI_STATUS
 EFIAPI

 SmbiosAdd (

   IN CONST EFI_SMBIOS_PROTOCOL  *This,

-  IN EFI_HANDLE                 ProducerHandle, OPTIONAL

+  IN EFI_HANDLE                 ProducerHandle  OPTIONAL,

   IN OUT EFI_SMBIOS_HANDLE      *SmbiosHandle,

   IN EFI_SMBIOS_TABLE_HEADER    *Record

   )

@@ -898,7 +898,7 @@ EFIAPI
 SmbiosGetNext (

   IN CONST EFI_SMBIOS_PROTOCOL      *This,

   IN OUT EFI_SMBIOS_HANDLE          *SmbiosHandle,

-  IN EFI_SMBIOS_TYPE                *Type,          OPTIONAL

+  IN EFI_SMBIOS_TYPE                *Type           OPTIONAL,

   OUT EFI_SMBIOS_TABLE_HEADER       **Record,

   OUT EFI_HANDLE                    *ProducerHandle OPTIONAL

   )

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/RuntimeDxeUnitTest/VariableLockRequestToLockUnitTest.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/RuntimeDxeUnitTest/VariableLockRequestToLockUnitTest.c
index 880994fe71..aafe3ca006 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/RuntimeDxeUnitTest/VariableLockRequestToLockUnitTest.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/RuntimeDxeUnitTest/VariableLockRequestToLockUnitTest.c
@@ -86,7 +86,7 @@ EFIAPI
 StubGetVariableNull (

   IN     CHAR16    *VariableName,

   IN     EFI_GUID  *VendorGuid,

-  OUT    UINT32    *Attributes,  OPTIONAL

+  OUT    UINT32    *Attributes   OPTIONAL,

   IN OUT UINTN     *DataSize,

   OUT    VOID      *Data         OPTIONAL

   )