MdePkg: 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>

MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.c

@@ -349,7 +349,7 @@ EFIAPI
 ExtractGuidedSectionDecode (
   IN  CONST VOID    *InputSection,
   OUT       VOID    **OutputBuffer,
-  IN        VOID    *ScratchBuffer,        OPTIONAL
+  IN        VOID    *ScratchBuffer         OPTIONAL,
   OUT       UINT32  *AuthenticationStatus
   )
 {
@@ -434,7 +434,7 @@ RETURN_STATUS
 EFIAPI
 ExtractGuidedSectionGetHandlers (
   IN CONST   GUID                                     *SectionGuid,
-  OUT        EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER  *GetInfoHandler,  OPTIONAL
+  OUT        EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER  *GetInfoHandler   OPTIONAL,
   OUT        EXTRACT_GUIDED_SECTION_DECODE_HANDLER    *DecodeHandler    OPTIONAL
   )
 {

MdePkg/Library/BaseLib/Arm/InternalSwitchStack.c

@@ -28,8 +28,8 @@ VOID
 EFIAPI
 InternalSwitchStackAsm (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,   OPTIONAL
-  IN      VOID                      *Context2,   OPTIONAL
+  IN      VOID                      *Context1    OPTIONAL,
+  IN      VOID                      *Context2    OPTIONAL,
   IN      VOID                      *NewStack
   );
 
@@ -62,8 +62,8 @@ VOID
 EFIAPI
 InternalSwitchStack (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,   OPTIONAL
-  IN      VOID                      *Context2,   OPTIONAL
+  IN      VOID                      *Context1    OPTIONAL,
+  IN      VOID                      *Context2    OPTIONAL,
   IN      VOID                      *NewStack,
   IN      VA_LIST                   Marker
   )

MdePkg/Library/BaseLib/BaseLibInternals.h

@@ -326,8 +326,8 @@ VOID
 EFIAPI
 InternalSwitchStack (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,   OPTIONAL
-  IN      VOID                      *Context2,   OPTIONAL
+  IN      VOID                      *Context1    OPTIONAL,
+  IN      VOID                      *Context2    OPTIONAL,
   IN      VOID                      *NewStack,
   IN      VA_LIST                   Marker
   );
@@ -699,8 +699,8 @@ VOID
 EFIAPI
 InternalX86EnablePaging32 (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,  OPTIONAL
-  IN      VOID                      *Context2,  OPTIONAL
+  IN      VOID                      *Context1   OPTIONAL,
+  IN      VOID                      *Context2   OPTIONAL,
   IN      VOID                      *NewStack
   );
 
@@ -738,8 +738,8 @@ VOID
 EFIAPI
 InternalX86DisablePaging32 (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,  OPTIONAL
-  IN      VOID                      *Context2,  OPTIONAL
+  IN      VOID                      *Context1   OPTIONAL,
+  IN      VOID                      *Context2   OPTIONAL,
   IN      VOID                      *NewStack
   );
 
@@ -775,8 +775,8 @@ EFIAPI
 InternalX86EnablePaging64 (
   IN      UINT16                    Cs,
   IN      UINT64                    EntryPoint,
-  IN      UINT64                    Context1,  OPTIONAL
-  IN      UINT64                    Context2,  OPTIONAL
+  IN      UINT64                    Context1   OPTIONAL,
+  IN      UINT64                    Context2   OPTIONAL,
   IN      UINT64                    NewStack
   );
 
@@ -811,8 +811,8 @@ EFIAPI
 InternalX86DisablePaging64 (
   IN      UINT16                    Cs,
   IN      UINT32                    EntryPoint,
-  IN      UINT32                    Context1,  OPTIONAL
-  IN      UINT32                    Context2,  OPTIONAL
+  IN      UINT32                    Context1   OPTIONAL,
+  IN      UINT32                    Context2   OPTIONAL,
   IN      UINT32                    NewStack
   );
 

MdePkg/Library/BaseLib/Ebc/SwitchStack.c

@@ -36,8 +36,8 @@ VOID
 EFIAPI
 InternalSwitchStack (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,   OPTIONAL
-  IN      VOID                      *Context2,   OPTIONAL
+  IN      VOID                      *Context1    OPTIONAL,
+  IN      VOID                      *Context2    OPTIONAL,
   IN      VOID                      *NewStack,
   IN      VA_LIST                   Marker
   )

MdePkg/Library/BaseLib/Ia32/CpuId.c

@@ -35,9 +35,9 @@ UINT32
 EFIAPI
 AsmCpuid (
   IN      UINT32                    Index,
-  OUT     UINT32                    *RegisterEax,  OPTIONAL
-  OUT     UINT32                    *RegisterEbx,  OPTIONAL
-  OUT     UINT32                    *RegisterEcx,  OPTIONAL
+  OUT     UINT32                    *RegisterEax   OPTIONAL,
+  OUT     UINT32                    *RegisterEbx   OPTIONAL,
+  OUT     UINT32                    *RegisterEcx   OPTIONAL,
   OUT     UINT32                    *RegisterEdx   OPTIONAL
   )
 {
@@ -65,4 +65,3 @@ SkipEdx:
     mov     eax, Index
   }
 }
-

MdePkg/Library/BaseLib/Ia32/CpuIdEx.c

@@ -43,9 +43,9 @@ EFIAPI
 AsmCpuidEx (
   IN      UINT32                    Index,
   IN      UINT32                    SubIndex,
-  OUT     UINT32                    *RegisterEax,  OPTIONAL
-  OUT     UINT32                    *RegisterEbx,  OPTIONAL
-  OUT     UINT32                    *RegisterEcx,  OPTIONAL
+  OUT     UINT32                    *RegisterEax   OPTIONAL,
+  OUT     UINT32                    *RegisterEbx   OPTIONAL,
+  OUT     UINT32                    *RegisterEcx   OPTIONAL,
   OUT     UINT32                    *RegisterEdx   OPTIONAL
   )
 {

MdePkg/Library/BaseLib/Ia32/DisablePaging32.c

@@ -43,8 +43,8 @@ VOID
 EFIAPI
 InternalX86DisablePaging32 (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,    OPTIONAL
-  IN      VOID                      *Context2,    OPTIONAL
+  IN      VOID                      *Context1     OPTIONAL,
+  IN      VOID                      *Context2     OPTIONAL,
   IN      VOID                      *NewStack
   )
 {

MdePkg/Library/BaseLib/Ia32/EnablePaging32.c

@@ -46,8 +46,8 @@ VOID
 EFIAPI
 InternalX86EnablePaging32 (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,    OPTIONAL
-  IN      VOID                      *Context2,    OPTIONAL
+  IN      VOID                      *Context1     OPTIONAL,
+  IN      VOID                      *Context2     OPTIONAL,
   IN      VOID                      *NewStack
   )
 {
@@ -72,4 +72,3 @@ InternalX86EnablePaging32 (
     jmp     $
   }
 }
-

MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c

@@ -36,8 +36,8 @@ VOID
 EFIAPI
 InternalSwitchStack (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,   OPTIONAL
-  IN      VOID                      *Context2,   OPTIONAL
+  IN      VOID                      *Context1    OPTIONAL,
+  IN      VOID                      *Context2    OPTIONAL,
   IN      VOID                      *NewStack,
   IN      VA_LIST                   Marker
   )

MdePkg/Library/BaseLib/Ia32/Non-existing.c

@@ -39,8 +39,8 @@ EFIAPI
 InternalX86DisablePaging64 (
   IN      UINT16                    CodeSelector,
   IN      UINT32                    EntryPoint,
-  IN      UINT32                    Context1,  OPTIONAL
-  IN      UINT32                    Context2,  OPTIONAL
+  IN      UINT32                    Context1   OPTIONAL,
+  IN      UINT32                    Context2   OPTIONAL,
   IN      UINT32                    NewStack
   )
 {

MdePkg/Library/BaseLib/RiscV64/InternalSwitchStack.c

@@ -36,8 +36,8 @@ VOID
 EFIAPI
 InternalSwitchStack (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,   OPTIONAL
-  IN      VOID                      *Context2,   OPTIONAL
+  IN      VOID                      *Context1    OPTIONAL,
+  IN      VOID                      *Context2    OPTIONAL,
   IN      VOID                      *NewStack,
   IN      VA_LIST                   Marker
   )

MdePkg/Library/BaseLib/SafeString.c

@@ -620,7 +620,7 @@ RETURN_STATUS
 EFIAPI
 StrDecimalToUintnS (
   IN  CONST CHAR16             *String,
-  OUT       CHAR16             **EndPointer,  OPTIONAL
+  OUT       CHAR16             **EndPointer   OPTIONAL,
   OUT       UINTN              *Data
   )
 {
@@ -730,7 +730,7 @@ RETURN_STATUS
 EFIAPI
 StrDecimalToUint64S (
   IN  CONST CHAR16             *String,
-  OUT       CHAR16             **EndPointer,  OPTIONAL
+  OUT       CHAR16             **EndPointer   OPTIONAL,
   OUT       UINT64             *Data
   )
 {
@@ -845,7 +845,7 @@ RETURN_STATUS
 EFIAPI
 StrHexToUintnS (
   IN  CONST CHAR16             *String,
-  OUT       CHAR16             **EndPointer,  OPTIONAL
+  OUT       CHAR16             **EndPointer   OPTIONAL,
   OUT       UINTN              *Data
   )
 {
@@ -971,7 +971,7 @@ RETURN_STATUS
 EFIAPI
 StrHexToUint64S (
   IN  CONST CHAR16             *String,
-  OUT       CHAR16             **EndPointer,  OPTIONAL
+  OUT       CHAR16             **EndPointer   OPTIONAL,
   OUT       UINT64             *Data
   )
 {
@@ -1099,7 +1099,7 @@ RETURN_STATUS
 EFIAPI
 StrToIpv6Address (
   IN  CONST CHAR16       *String,
-  OUT CHAR16             **EndPointer, OPTIONAL
+  OUT CHAR16             **EndPointer  OPTIONAL,
   OUT IPv6_ADDRESS       *Address,
   OUT UINT8              *PrefixLength OPTIONAL
   )
@@ -1314,7 +1314,7 @@ RETURN_STATUS
 EFIAPI
 StrToIpv4Address (
   IN  CONST CHAR16       *String,
-  OUT CHAR16             **EndPointer, OPTIONAL
+  OUT CHAR16             **EndPointer  OPTIONAL,
   OUT IPv4_ADDRESS       *Address,
   OUT UINT8              *PrefixLength OPTIONAL
   )
@@ -2125,7 +2125,7 @@ RETURN_STATUS
 EFIAPI
 AsciiStrDecimalToUintnS (
   IN  CONST CHAR8              *String,
-  OUT       CHAR8              **EndPointer,  OPTIONAL
+  OUT       CHAR8              **EndPointer   OPTIONAL,
   OUT       UINTN              *Data
   )
 {
@@ -2231,7 +2231,7 @@ RETURN_STATUS
 EFIAPI
 AsciiStrDecimalToUint64S (
   IN  CONST CHAR8              *String,
-  OUT       CHAR8              **EndPointer,  OPTIONAL
+  OUT       CHAR8              **EndPointer   OPTIONAL,
   OUT       UINT64             *Data
   )
 {
@@ -2341,7 +2341,7 @@ RETURN_STATUS
 EFIAPI
 AsciiStrHexToUintnS (
   IN  CONST CHAR8              *String,
-  OUT       CHAR8              **EndPointer,  OPTIONAL
+  OUT       CHAR8              **EndPointer   OPTIONAL,
   OUT       UINTN              *Data
   )
 {
@@ -2462,7 +2462,7 @@ RETURN_STATUS
 EFIAPI
 AsciiStrHexToUint64S (
   IN  CONST CHAR8              *String,
-  OUT       CHAR8              **EndPointer,  OPTIONAL
+  OUT       CHAR8              **EndPointer   OPTIONAL,
   OUT       UINT64             *Data
   )
 {
@@ -3013,7 +3013,7 @@ RETURN_STATUS
 EFIAPI
 AsciiStrToIpv6Address (
   IN  CONST CHAR8        *String,
-  OUT CHAR8              **EndPointer, OPTIONAL
+  OUT CHAR8              **EndPointer  OPTIONAL,
   OUT IPv6_ADDRESS       *Address,
   OUT UINT8              *PrefixLength OPTIONAL
   )
@@ -3225,7 +3225,7 @@ RETURN_STATUS
 EFIAPI
 AsciiStrToIpv4Address (
   IN  CONST CHAR8        *String,
-  OUT CHAR8              **EndPointer, OPTIONAL
+  OUT CHAR8              **EndPointer  OPTIONAL,
   OUT IPv4_ADDRESS       *Address,
   OUT UINT8              *PrefixLength OPTIONAL
   )
@@ -3532,4 +3532,3 @@ AsciiStrHexToBytes (
   }
   return RETURN_SUCCESS;
 }
-

MdePkg/Library/BaseLib/SwitchStack.c

@@ -41,8 +41,8 @@ VOID
 EFIAPI
 SwitchStack (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,  OPTIONAL
-  IN      VOID                      *Context2,  OPTIONAL
+  IN      VOID                      *Context1   OPTIONAL,
+  IN      VOID                      *Context2   OPTIONAL,
   IN      VOID                      *NewStack,
   ...
   )

MdePkg/Library/BaseLib/X64/Non-existing.c

@@ -46,8 +46,8 @@ VOID
 EFIAPI
 InternalX86EnablePaging32 (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,  OPTIONAL
-  IN      VOID                      *Context2,  OPTIONAL
+  IN      VOID                      *Context1   OPTIONAL,
+  IN      VOID                      *Context2   OPTIONAL,
   IN      VOID                      *NewStack
   )
 {
@@ -91,8 +91,8 @@ VOID
 EFIAPI
 InternalX86DisablePaging32 (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,  OPTIONAL
-  IN      VOID                      *Context2,  OPTIONAL
+  IN      VOID                      *Context1   OPTIONAL,
+  IN      VOID                      *Context2   OPTIONAL,
   IN      VOID                      *NewStack
   )
 {
@@ -135,8 +135,8 @@ EFIAPI
 InternalX86EnablePaging64 (
   IN      UINT16                    Cs,
   IN      UINT64                    EntryPoint,
-  IN      UINT64                    Context1,  OPTIONAL
-  IN      UINT64                    Context2,  OPTIONAL
+  IN      UINT64                    Context1   OPTIONAL,
+  IN      UINT64                    Context2   OPTIONAL,
   IN      UINT64                    NewStack
   )
 {

MdePkg/Library/BaseLib/X86DisablePaging32.c

@@ -49,8 +49,8 @@ VOID
 EFIAPI
 AsmDisablePaging32 (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,  OPTIONAL
-  IN      VOID                      *Context2,  OPTIONAL
+  IN      VOID                      *Context1   OPTIONAL,
+  IN      VOID                      *Context2   OPTIONAL,
   IN      VOID                      *NewStack
   )
 {

MdePkg/Library/BaseLib/X86DisablePaging64.c

@@ -46,8 +46,8 @@ EFIAPI
 AsmDisablePaging64 (
   IN      UINT16                    Cs,
   IN      UINT32                    EntryPoint,
-  IN      UINT32                    Context1,  OPTIONAL
-  IN      UINT32                    Context2,  OPTIONAL
+  IN      UINT32                    Context1   OPTIONAL,
+  IN      UINT32                    Context2   OPTIONAL,
   IN      UINT32                    NewStack
   )
 {

MdePkg/Library/BaseLib/X86EnablePaging32.c

@@ -52,8 +52,8 @@ VOID
 EFIAPI
 AsmEnablePaging32 (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,  OPTIONAL
-  IN      VOID                      *Context2,  OPTIONAL
+  IN      VOID                      *Context1   OPTIONAL,
+  IN      VOID                      *Context2   OPTIONAL,
   IN      VOID                      *NewStack
   )
 {

MdePkg/Library/BaseLib/X86EnablePaging64.c

@@ -48,8 +48,8 @@ EFIAPI
 AsmEnablePaging64 (
   IN      UINT16                    Cs,
   IN      UINT64                    EntryPoint,
-  IN      UINT64                    Context1,  OPTIONAL
-  IN      UINT64                    Context2,  OPTIONAL
+  IN      UINT64                    Context1   OPTIONAL,
+  IN      UINT64                    Context2   OPTIONAL,
   IN      UINT64                    NewStack
   )
 {

MdePkg/Library/BaseLib/X86UnitTestHost.c

@@ -60,9 +60,9 @@ UINT32
 EFIAPI
 UnitTestHostBaseLibAsmCpuid (
   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
   )
 {
@@ -118,9 +118,9 @@ EFIAPI
 UnitTestHostBaseLibAsmCpuidEx (
   IN      UINT32                    Index,
   IN      UINT32                    SubIndex,
-  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
   )
 {
@@ -1119,8 +1119,8 @@ VOID
 EFIAPI
 UnitTestHostBaseLibAsmEnablePaging32 (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,  OPTIONAL
-  IN      VOID                      *Context2,  OPTIONAL
+  IN      VOID                      *Context1   OPTIONAL,
+  IN      VOID                      *Context2   OPTIONAL,
   IN      VOID                      *NewStack
   )
 {
@@ -1165,8 +1165,8 @@ VOID
 EFIAPI
 UnitTestHostBaseLibAsmDisablePaging32 (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,  OPTIONAL
-  IN      VOID                      *Context2,  OPTIONAL
+  IN      VOID                      *Context1   OPTIONAL,
+  IN      VOID                      *Context2   OPTIONAL,
   IN      VOID                      *NewStack
   )
 {
@@ -1210,8 +1210,8 @@ EFIAPI
 UnitTestHostBaseLibAsmEnablePaging64 (
   IN      UINT16                    Cs,
   IN      UINT64                    EntryPoint,
-  IN      UINT64                    Context1,  OPTIONAL
-  IN      UINT64                    Context2,  OPTIONAL
+  IN      UINT64                    Context1   OPTIONAL,
+  IN      UINT64                    Context2   OPTIONAL,
   IN      UINT64                    NewStack
   )
 {
@@ -1256,8 +1256,8 @@ EFIAPI
 UnitTestHostBaseLibAsmDisablePaging64 (
   IN      UINT16                    Cs,
   IN      UINT32                    EntryPoint,
-  IN      UINT32                    Context1,  OPTIONAL
-  IN      UINT32                    Context2,  OPTIONAL
+  IN      UINT32                    Context1   OPTIONAL,
+  IN      UINT32                    Context2   OPTIONAL,
   IN      UINT32                    NewStack
   )
 {
@@ -1512,9 +1512,9 @@ UINT32
 EFIAPI
 AsmCpuid (
   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
   )
 {
@@ -1558,9 +1558,9 @@ EFIAPI
 AsmCpuidEx (
   IN      UINT32                    Index,
   IN      UINT32                    SubIndex,
-  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
   )
 {
@@ -2527,8 +2527,8 @@ VOID
 EFIAPI
 AsmEnablePaging32 (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,  OPTIONAL
-  IN      VOID                      *Context2,  OPTIONAL
+  IN      VOID                      *Context1   OPTIONAL,
+  IN      VOID                      *Context2   OPTIONAL,
   IN      VOID                      *NewStack
   )
 {
@@ -2573,8 +2573,8 @@ VOID
 EFIAPI
 AsmDisablePaging32 (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,  OPTIONAL
-  IN      VOID                      *Context2,  OPTIONAL
+  IN      VOID                      *Context1   OPTIONAL,
+  IN      VOID                      *Context2   OPTIONAL,
   IN      VOID                      *NewStack
   )
 {
@@ -2618,8 +2618,8 @@ EFIAPI
 AsmEnablePaging64 (
   IN      UINT16                    Cs,
   IN      UINT64                    EntryPoint,
-  IN      UINT64                    Context1,  OPTIONAL
-  IN      UINT64                    Context2,  OPTIONAL
+  IN      UINT64                    Context1   OPTIONAL,
+  IN      UINT64                    Context2   OPTIONAL,
   IN      UINT64                    NewStack
   )
 {
@@ -2661,8 +2661,8 @@ EFIAPI
 AsmDisablePaging64 (
   IN      UINT16                    Cs,
   IN      UINT32                    EntryPoint,
-  IN      UINT32                    Context1,  OPTIONAL
-  IN      UINT32                    Context2,  OPTIONAL
+  IN      UINT32                    Context1   OPTIONAL,
+  IN      UINT32                    Context2   OPTIONAL,
   IN      UINT32                    NewStack
   )
 {

MdePkg/Library/BasePcdLibNull/PcdLib.c

@@ -742,7 +742,7 @@ LibPcdSetExBoolS (
 VOID
 EFIAPI
 LibPcdCallbackOnSet (
-  IN CONST GUID               *Guid,       OPTIONAL
+  IN CONST GUID               *Guid        OPTIONAL,
   IN UINTN                    TokenNumber,
   IN PCD_CALLBACK             NotificationFunction
   )
@@ -769,7 +769,7 @@ LibPcdCallbackOnSet (
 VOID
 EFIAPI
 LibPcdCancelCallback (
-  IN CONST GUID               *Guid,       OPTIONAL
+  IN CONST GUID               *Guid        OPTIONAL,
   IN UINTN                    TokenNumber,
   IN PCD_CALLBACK             NotificationFunction
   )
@@ -801,7 +801,7 @@ LibPcdCancelCallback (
 UINTN
 EFIAPI
 LibPcdGetNextToken (
-  IN CONST GUID               *Guid,       OPTIONAL
+  IN CONST GUID               *Guid        OPTIONAL,
   IN UINTN                    TokenNumber
   )
 {
@@ -1110,4 +1110,3 @@ LibPcdGetSku (
 
   return 0;
 }
-

MdePkg/Library/BasePerformanceLibNull/PerformanceLib.c

@@ -38,9 +38,9 @@
 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
   )
 {
@@ -73,9 +73,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
   )
 {
@@ -167,9 +167,9 @@ GetPerformanceMeasurement (
 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
   )
@@ -205,9 +205,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
   )
@@ -317,10 +317,10 @@ PerformanceMeasurementEnabled (
 RETURN_STATUS
 EFIAPI
 LogPerformanceMeasurement (
-  IN CONST VOID   *CallerIdentifier,OPTIONAL
-  IN CONST VOID   *Guid,    OPTIONAL
-  IN CONST CHAR8  *String,  OPTIONAL
-  IN UINT64       Address,  OPTIONAL
+  IN CONST VOID   *CallerIdentifier OPTIONAL,
+  IN CONST VOID   *Guid     OPTIONAL,
+  IN CONST CHAR8  *String   OPTIONAL,
+  IN UINT64       Address   OPTIONAL,
   IN UINT32       Identifier
   )
 {

MdePkg/Library/BasePrintLib/PrintLibInternal.c

@@ -532,7 +532,7 @@ BasePrintLibSPrintMarker (
   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
   )
 {

MdePkg/Library/BasePrintLib/PrintLibInternal.h

@@ -82,7 +82,7 @@ BasePrintLibSPrintMarker (
   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
   );
 

MdePkg/Library/BaseTimerLibNullTemplate/TimerLibNull.c

@@ -97,7 +97,7 @@ GetPerformanceCounter (
 UINT64
 EFIAPI
 GetPerformanceCounterProperties (
-  OUT      UINT64                    *StartValue,  OPTIONAL
+  OUT      UINT64                    *StartValue   OPTIONAL,
   OUT      UINT64                    *EndValue     OPTIONAL
   )
 {

MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.c

@@ -141,7 +141,7 @@ EFIAPI
 TianoDecompress (
   IN CONST  VOID    *InputSection,
   OUT       VOID    **OutputBuffer,
-  IN        VOID    *ScratchBuffer,        OPTIONAL
+  IN        VOID    *ScratchBuffer         OPTIONAL,
   OUT       UINT32  *AuthenticationStatus
   )
 {

MdePkg/Library/DxeCoreHobLib/HobLib.c

@@ -454,7 +454,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
   )
 {

MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.c

@@ -342,7 +342,7 @@ EFIAPI
 ExtractGuidedSectionDecode (
   IN  CONST VOID    *InputSection,
   OUT       VOID    **OutputBuffer,
-  IN        VOID    *ScratchBuffer,        OPTIONAL
+  IN        VOID    *ScratchBuffer         OPTIONAL,
   OUT       UINT32  *AuthenticationStatus
   )
 {
@@ -416,7 +416,7 @@ RETURN_STATUS
 EFIAPI
 ExtractGuidedSectionGetHandlers (
   IN CONST   GUID                                     *SectionGuid,
-  OUT        EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER  *GetInfoHandler,  OPTIONAL
+  OUT        EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER  *GetInfoHandler   OPTIONAL,
   OUT        EXTRACT_GUIDED_SECTION_DECODE_HANDLER    *DecodeHandler    OPTIONAL
   )
 {

MdePkg/Library/DxeHobLib/HobLib.c

@@ -488,7 +488,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
   )
 {

MdePkg/Library/DxeHstiLib/HstiDxe.c

@@ -375,7 +375,7 @@ HstiLibGetTable (
 EFI_STATUS
 InternalHstiRecordFeaturesVerified (
   IN UINT32                   Role,
-  IN CHAR16                   *ImplementationID, OPTIONAL
+  IN CHAR16                   *ImplementationID  OPTIONAL,
   IN UINT32                   ByteIndex,
   IN UINT8                    Bit,
   IN BOOLEAN                  Set
@@ -433,7 +433,7 @@ EFI_STATUS
 EFIAPI
 HstiLibSetFeaturesVerified (
   IN UINT32                   Role,
-  IN CHAR16                   *ImplementationID, OPTIONAL
+  IN CHAR16                   *ImplementationID  OPTIONAL,
   IN UINT32                   ByteIndex,
   IN UINT8                    BitMask
   )
@@ -466,7 +466,7 @@ EFI_STATUS
 EFIAPI
 HstiLibClearFeaturesVerified (
   IN UINT32                   Role,
-  IN CHAR16                   *ImplementationID, OPTIONAL
+  IN CHAR16                   *ImplementationID  OPTIONAL,
   IN UINT32                   ByteIndex,
   IN UINT8                    BitMask
   )
@@ -499,7 +499,7 @@ HstiLibClearFeaturesVerified (
 EFI_STATUS
 InternalHstiRecordErrorString (
   IN UINT32                   Role,
-  IN CHAR16                   *ImplementationID, OPTIONAL
+  IN CHAR16                   *ImplementationID  OPTIONAL,
   IN CHAR16                   *ErrorString,
   IN BOOLEAN                  Append
   )
@@ -563,7 +563,7 @@ EFI_STATUS
 EFIAPI
 HstiLibAppendErrorString (
   IN UINT32                   Role,
-  IN CHAR16                   *ImplementationID, OPTIONAL
+  IN CHAR16                   *ImplementationID  OPTIONAL,
   IN CHAR16                   *ErrorString
   )
 {
@@ -593,7 +593,7 @@ EFI_STATUS
 EFIAPI
 HstiLibSetErrorString (
   IN UINT32                   Role,
-  IN CHAR16                   *ImplementationID, OPTIONAL
+  IN CHAR16                   *ImplementationID  OPTIONAL,
   IN CHAR16                   *ErrorString
   )
 {

MdePkg/Library/DxePcdLib/DxePcdLib.c

@@ -829,7 +829,7 @@ LibPcdSetExBoolS (
 VOID
 EFIAPI
 LibPcdCallbackOnSet (
-  IN CONST GUID               *Guid,       OPTIONAL
+  IN CONST GUID               *Guid        OPTIONAL,
   IN UINTN                    TokenNumber,
   IN PCD_CALLBACK             NotificationFunction
   )
@@ -862,7 +862,7 @@ LibPcdCallbackOnSet (
 VOID
 EFIAPI
 LibPcdCancelCallback (
-  IN CONST GUID               *Guid,       OPTIONAL
+  IN CONST GUID               *Guid        OPTIONAL,
   IN UINTN                    TokenNumber,
   IN PCD_CALLBACK             NotificationFunction
   )
@@ -901,7 +901,7 @@ LibPcdCancelCallback (
 UINTN
 EFIAPI
 LibPcdGetNextToken (
-  IN CONST GUID               *Guid,       OPTIONAL
+  IN CONST GUID               *Guid        OPTIONAL,
   IN UINTN                    TokenNumber
   )
 {
@@ -1218,4 +1218,3 @@ LibPcdGetSku (
 {
   return GetPiPcdInfoProtocolPointer()->GetSku ();
 }
-

MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.c

@@ -384,7 +384,7 @@ EFIAPI
 ExtractGuidedSectionDecode (
   IN  CONST VOID    *InputSection,
   OUT       VOID    **OutputBuffer,
-  IN        VOID    *ScratchBuffer,        OPTIONAL
+  IN        VOID    *ScratchBuffer         OPTIONAL,
   OUT       UINT32  *AuthenticationStatus
   )
 {
@@ -469,7 +469,7 @@ RETURN_STATUS
 EFIAPI
 ExtractGuidedSectionGetHandlers (
   IN CONST   GUID                                     *SectionGuid,
-  OUT        EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER  *GetInfoHandler,  OPTIONAL
+  OUT        EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER  *GetInfoHandler   OPTIONAL,
   OUT        EXTRACT_GUIDED_SECTION_DECODE_HANDLER    *DecodeHandler    OPTIONAL
   )
 {

MdePkg/Library/PeiHobLib/HobLib.c

@@ -631,7 +631,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
   )
 {

MdePkg/Library/PeiPcdLib/PeiPcdLib.c

@@ -829,7 +829,7 @@ LibPcdSetExBoolS (
 VOID
 EFIAPI
 LibPcdCallbackOnSet (
-  IN CONST GUID               *Guid,       OPTIONAL
+  IN CONST GUID               *Guid        OPTIONAL,
   IN UINTN                    TokenNumber,
   IN PCD_CALLBACK             NotificationFunction
   )
@@ -863,7 +863,7 @@ LibPcdCallbackOnSet (
 VOID
 EFIAPI
 LibPcdCancelCallback (
-  IN CONST GUID               *Guid,       OPTIONAL
+  IN CONST GUID               *Guid        OPTIONAL,
   IN UINTN                    TokenNumber,
   IN PCD_CALLBACK             NotificationFunction
   )
@@ -903,7 +903,7 @@ LibPcdCancelCallback (
 UINTN
 EFIAPI
 LibPcdGetNextToken (
-  IN CONST GUID               *Guid,       OPTIONAL
+  IN CONST GUID               *Guid        OPTIONAL,
   IN UINTN                    TokenNumber
   )
 {

MdePkg/Library/PeiServicesLib/PeiServicesLib.c

@@ -89,7 +89,7 @@ EFIAPI
 PeiServicesLocatePpi (
   IN CONST EFI_GUID                   *Guid,
   IN UINTN                      Instance,
-  IN OUT EFI_PEI_PPI_DESCRIPTOR **PpiDescriptor, OPTIONAL
+  IN OUT EFI_PEI_PPI_DESCRIPTOR **PpiDescriptor  OPTIONAL,
   IN OUT VOID                   **Ppi
   )
 {
@@ -622,11 +622,11 @@ VOID
 EFIAPI
 InternalPeiServicesInstallFvInfoPpi (
   IN       BOOLEAN                 InstallFvInfoPpi,
-  IN CONST EFI_GUID                *FvFormat, OPTIONAL
+  IN CONST EFI_GUID                *FvFormat  OPTIONAL,
   IN CONST VOID                    *FvInfo,
   IN       UINT32                  FvInfoSize,
-  IN CONST EFI_GUID                *ParentFvName, OPTIONAL
-  IN CONST EFI_GUID                *ParentFileName, OPTIONAL
+  IN CONST EFI_GUID                *ParentFvName  OPTIONAL,
+  IN CONST EFI_GUID                *ParentFileName  OPTIONAL,
   IN       UINT32                  AuthenticationStatus
   )
 {
@@ -728,10 +728,10 @@ InternalPeiServicesInstallFvInfoPpi (
 VOID
 EFIAPI
 PeiServicesInstallFvInfoPpi (
-  IN CONST EFI_GUID                *FvFormat, OPTIONAL
+  IN CONST EFI_GUID                *FvFormat  OPTIONAL,
   IN CONST VOID                    *FvInfo,
   IN       UINT32                  FvInfoSize,
-  IN CONST EFI_GUID                *ParentFvName, OPTIONAL
+  IN CONST EFI_GUID                *ParentFvName  OPTIONAL,
   IN CONST EFI_GUID                *ParentFileName OPTIONAL
   )
 {
@@ -772,11 +772,11 @@ PeiServicesInstallFvInfoPpi (
 VOID
 EFIAPI
 PeiServicesInstallFvInfo2Ppi (
-  IN CONST EFI_GUID                *FvFormat, OPTIONAL
+  IN CONST EFI_GUID                *FvFormat  OPTIONAL,
   IN CONST VOID                    *FvInfo,
   IN       UINT32                  FvInfoSize,
-  IN CONST EFI_GUID                *ParentFvName, OPTIONAL
-  IN CONST EFI_GUID                *ParentFileName, OPTIONAL
+  IN CONST EFI_GUID                *ParentFvName  OPTIONAL,
+  IN CONST EFI_GUID                *ParentFileName  OPTIONAL,
   IN       UINT32                  AuthenticationStatus
   )
 {

MdePkg/Library/SecPeiDxeTimerLibCpu/X86TimerLib.c

@@ -305,7 +305,7 @@ GetPerformanceCounter (
 UINT64
 EFIAPI
 GetPerformanceCounterProperties (
-  OUT      UINT64                    *StartValue,  OPTIONAL
+  OUT      UINT64                    *StartValue   OPTIONAL,
   OUT      UINT64                    *EndValue     OPTIONAL
   )
 {

MdePkg/Library/SmiHandlerProfileLibNull/SmiHandlerProfileLibNull.c

@@ -35,7 +35,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
   )
 {
@@ -64,7 +64,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
   )
 {

MdePkg/Library/SmmPeriodicSmiLib/SmmPeriodicSmiLib.c

@@ -606,7 +606,7 @@ PeriodicSmiYield (
 VOID
 EFIAPI
 PeriodicSmiDispatchFunctionSwitchStack (
-  IN VOID  *Context1,  OPTIONAL
+  IN VOID  *Context1   OPTIONAL,
   IN VOID  *Context2   OPTIONAL
   )
 {
@@ -898,9 +898,9 @@ PeriodicSmiDispatchFunction (
 EFI_STATUS
 EFIAPI
 PeriodicSmiEnable (
-  IN OUT EFI_HANDLE                    *DispatchHandle,    OPTIONAL
+  IN OUT EFI_HANDLE                    *DispatchHandle     OPTIONAL,
   IN     PERIODIC_SMI_LIBRARY_HANDLER  DispatchFunction,
-  IN     CONST VOID                    *Context,           OPTIONAL
+  IN     CONST VOID                    *Context            OPTIONAL,
   IN     UINT64                        TickPeriod,
   IN     UINTN                         Cpu,
   IN     UINTN                         StackSize

MdePkg/Library/UefiDevicePathLib/DevicePathUtilities.c

@@ -449,7 +449,7 @@ UefiDevicePathLibDuplicateDevicePath (
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 UefiDevicePathLibAppendDevicePath (
-  IN CONST EFI_DEVICE_PATH_PROTOCOL  *FirstDevicePath,  OPTIONAL
+  IN CONST EFI_DEVICE_PATH_PROTOCOL  *FirstDevicePath   OPTIONAL,
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *SecondDevicePath  OPTIONAL
   )
 {
@@ -528,7 +528,7 @@ UefiDevicePathLibAppendDevicePath (
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 UefiDevicePathLibAppendDevicePathNode (
-  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath,     OPTIONAL
+  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath      OPTIONAL,
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePathNode  OPTIONAL
   )
 {
@@ -591,7 +591,7 @@ UefiDevicePathLibAppendDevicePathNode (
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 UefiDevicePathLibAppendDevicePathInstance (
-  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath,        OPTIONAL
+  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath         OPTIONAL,
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePathInstance OPTIONAL
   )
 {
@@ -830,7 +830,7 @@ UefiDevicePathLibIsDevicePathMultiInstance (
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 FileDevicePath (
-  IN EFI_HANDLE                      Device,     OPTIONAL
+  IN EFI_HANDLE                      Device      OPTIONAL,
   IN CONST CHAR16                    *FileName
   )
 {
@@ -861,4 +861,3 @@ FileDevicePath (
 
   return DevicePath;
 }
-

MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c

@@ -90,7 +90,7 @@ DuplicateDevicePath (
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 AppendDevicePath (
-  IN CONST EFI_DEVICE_PATH_PROTOCOL  *FirstDevicePath,  OPTIONAL
+  IN CONST EFI_DEVICE_PATH_PROTOCOL  *FirstDevicePath   OPTIONAL,
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *SecondDevicePath  OPTIONAL
   )
 {
@@ -128,7 +128,7 @@ AppendDevicePath (
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 AppendDevicePathNode (
-  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath,     OPTIONAL
+  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath      OPTIONAL,
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePathNode  OPTIONAL
   )
 {
@@ -161,7 +161,7 @@ AppendDevicePathNode (
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 AppendDevicePathInstance (
-  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath,        OPTIONAL
+  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath         OPTIONAL,
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePathInstance OPTIONAL
   )
 {

MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.h

@@ -214,7 +214,7 @@ UefiDevicePathLibDuplicateDevicePath (
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 UefiDevicePathLibAppendDevicePath (
-  IN CONST EFI_DEVICE_PATH_PROTOCOL  *FirstDevicePath,  OPTIONAL
+  IN CONST EFI_DEVICE_PATH_PROTOCOL  *FirstDevicePath   OPTIONAL,
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *SecondDevicePath  OPTIONAL
   );
 
@@ -249,7 +249,7 @@ UefiDevicePathLibAppendDevicePath (
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 UefiDevicePathLibAppendDevicePathNode (
-  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath,     OPTIONAL
+  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath      OPTIONAL,
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePathNode  OPTIONAL
   );
 
@@ -279,7 +279,7 @@ UefiDevicePathLibAppendDevicePathNode (
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 UefiDevicePathLibAppendDevicePathInstance (
-  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath,        OPTIONAL
+  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath         OPTIONAL,
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePathInstance OPTIONAL
   );
 

MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.c

@@ -135,7 +135,7 @@ DuplicateDevicePath (
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 AppendDevicePath (
-  IN CONST EFI_DEVICE_PATH_PROTOCOL  *FirstDevicePath,  OPTIONAL
+  IN CONST EFI_DEVICE_PATH_PROTOCOL  *FirstDevicePath   OPTIONAL,
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *SecondDevicePath  OPTIONAL
   )
 {
@@ -177,7 +177,7 @@ AppendDevicePath (
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 AppendDevicePathNode (
-  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath,     OPTIONAL
+  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath      OPTIONAL,
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePathNode  OPTIONAL
   )
 {
@@ -214,7 +214,7 @@ AppendDevicePathNode (
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 AppendDevicePathInstance (
-  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath,        OPTIONAL
+  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath         OPTIONAL,
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePathInstance OPTIONAL
   )
 {
@@ -475,4 +475,3 @@ ConvertTextToDevicePath (
 
   return UefiDevicePathLibConvertTextToDevicePath (TextDevicePath);
 }
-

MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c

@@ -456,7 +456,7 @@ DuplicateDevicePath (
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 AppendDevicePath (
-  IN CONST EFI_DEVICE_PATH_PROTOCOL  *FirstDevicePath,  OPTIONAL
+  IN CONST EFI_DEVICE_PATH_PROTOCOL  *FirstDevicePath   OPTIONAL,
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *SecondDevicePath  OPTIONAL
   )
 {
@@ -494,7 +494,7 @@ AppendDevicePath (
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 AppendDevicePathNode (
-  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath,     OPTIONAL
+  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath      OPTIONAL,
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePathNode  OPTIONAL
   )
 {
@@ -527,7 +527,7 @@ AppendDevicePathNode (
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 AppendDevicePathInstance (
-  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath,        OPTIONAL
+  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath         OPTIONAL,
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePathInstance OPTIONAL
   )
 {
@@ -684,7 +684,7 @@ DevicePathFromHandle (
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 FileDevicePath (
-  IN EFI_HANDLE                      Device,     OPTIONAL
+  IN EFI_HANDLE                      Device      OPTIONAL,
   IN CONST CHAR16                    *FileName
   )
 {
@@ -862,4 +862,3 @@ ConvertTextToDevicePath (
     return NULL;
   }
 }
-

MdePkg/Library/UefiLib/Acpi.c

@@ -33,7 +33,7 @@ ScanTableInSDT (
   IN  EFI_ACPI_DESCRIPTION_HEADER   *Sdt,
   IN  UINTN                         TablePointerSize,
   IN  UINT32                        Signature,
-  IN  EFI_ACPI_COMMON_HEADER        *PreviousTable, OPTIONAL
+  IN  EFI_ACPI_COMMON_HEADER        *PreviousTable  OPTIONAL,
   OUT BOOLEAN                       *PreviousTableLocated OPTIONAL
   )
 {
@@ -172,7 +172,7 @@ EFI_ACPI_COMMON_HEADER *
 LocateAcpiTableInAcpiConfigurationTable (
   IN  EFI_GUID                  *AcpiGuid,
   IN  UINT32                    Signature,
-  IN  EFI_ACPI_COMMON_HEADER    *PreviousTable, OPTIONAL
+  IN  EFI_ACPI_COMMON_HEADER    *PreviousTable  OPTIONAL,
   OUT BOOLEAN                   *PreviousTableLocated OPTIONAL
   )
 {

MdePkg/Library/UefiLib/Console.c

@@ -390,7 +390,7 @@ VOID
 EFIAPI
 CreatePopUp (
   IN  UINTN          Attribute,
-  OUT EFI_INPUT_KEY  *Key,      OPTIONAL
+  OUT EFI_INPUT_KEY  *Key       OPTIONAL,
   ...
   )
 {

MdePkg/Library/UefiLib/UefiDriverModel.c

@@ -137,8 +137,8 @@ EfiLibInstallAllDriverProtocols (
   IN CONST EFI_SYSTEM_TABLE                   *SystemTable,
   IN EFI_DRIVER_BINDING_PROTOCOL              *DriverBinding,
   IN EFI_HANDLE                               DriverBindingHandle,
-  IN CONST EFI_COMPONENT_NAME_PROTOCOL        *ComponentName,       OPTIONAL
-  IN CONST EFI_DRIVER_CONFIGURATION_PROTOCOL  *DriverConfiguration, OPTIONAL
+  IN CONST EFI_COMPONENT_NAME_PROTOCOL        *ComponentName        OPTIONAL,
+  IN CONST EFI_DRIVER_CONFIGURATION_PROTOCOL  *DriverConfiguration  OPTIONAL,
   IN CONST EFI_DRIVER_DIAGNOSTICS_PROTOCOL    *DriverDiagnostics    OPTIONAL
   )
 {
@@ -256,8 +256,8 @@ EFI_STATUS
 EFIAPI
 EfiLibUninstallAllDriverProtocols (
   IN EFI_DRIVER_BINDING_PROTOCOL              *DriverBinding,
-  IN CONST EFI_COMPONENT_NAME_PROTOCOL        *ComponentName,       OPTIONAL
-  IN CONST EFI_DRIVER_CONFIGURATION_PROTOCOL  *DriverConfiguration, OPTIONAL
+  IN CONST EFI_COMPONENT_NAME_PROTOCOL        *ComponentName        OPTIONAL,
+  IN CONST EFI_DRIVER_CONFIGURATION_PROTOCOL  *DriverConfiguration  OPTIONAL,
   IN CONST EFI_DRIVER_DIAGNOSTICS_PROTOCOL    *DriverDiagnostics    OPTIONAL
   )
 {
@@ -379,7 +379,7 @@ EfiLibInstallDriverBindingComponentName2 (
   IN CONST EFI_SYSTEM_TABLE                   *SystemTable,
   IN EFI_DRIVER_BINDING_PROTOCOL              *DriverBinding,
   IN EFI_HANDLE                               DriverBindingHandle,
-  IN CONST EFI_COMPONENT_NAME_PROTOCOL        *ComponentName,       OPTIONAL
+  IN CONST EFI_COMPONENT_NAME_PROTOCOL        *ComponentName        OPTIONAL,
   IN CONST EFI_COMPONENT_NAME2_PROTOCOL       *ComponentName2       OPTIONAL
   )
 {
@@ -455,7 +455,7 @@ EFI_STATUS
 EFIAPI
 EfiLibUninstallDriverBindingComponentName2 (
   IN EFI_DRIVER_BINDING_PROTOCOL              *DriverBinding,
-  IN CONST EFI_COMPONENT_NAME_PROTOCOL        *ComponentName,       OPTIONAL
+  IN CONST EFI_COMPONENT_NAME_PROTOCOL        *ComponentName        OPTIONAL,
   IN CONST EFI_COMPONENT_NAME2_PROTOCOL       *ComponentName2       OPTIONAL
   )
 {
@@ -543,11 +543,11 @@ EfiLibInstallAllDriverProtocols2 (
   IN CONST EFI_SYSTEM_TABLE                   *SystemTable,
   IN EFI_DRIVER_BINDING_PROTOCOL              *DriverBinding,
   IN EFI_HANDLE                               DriverBindingHandle,
-  IN CONST EFI_COMPONENT_NAME_PROTOCOL        *ComponentName,        OPTIONAL
-  IN CONST EFI_COMPONENT_NAME2_PROTOCOL       *ComponentName2,       OPTIONAL
-  IN CONST EFI_DRIVER_CONFIGURATION_PROTOCOL  *DriverConfiguration,  OPTIONAL
-  IN CONST EFI_DRIVER_CONFIGURATION2_PROTOCOL *DriverConfiguration2, OPTIONAL
-  IN CONST EFI_DRIVER_DIAGNOSTICS_PROTOCOL    *DriverDiagnostics,    OPTIONAL
+  IN CONST EFI_COMPONENT_NAME_PROTOCOL        *ComponentName         OPTIONAL,
+  IN CONST EFI_COMPONENT_NAME2_PROTOCOL       *ComponentName2        OPTIONAL,
+  IN CONST EFI_DRIVER_CONFIGURATION_PROTOCOL  *DriverConfiguration   OPTIONAL,
+  IN CONST EFI_DRIVER_CONFIGURATION2_PROTOCOL *DriverConfiguration2  OPTIONAL,
+  IN CONST EFI_DRIVER_DIAGNOSTICS_PROTOCOL    *DriverDiagnostics     OPTIONAL,
   IN CONST EFI_DRIVER_DIAGNOSTICS2_PROTOCOL   *DriverDiagnostics2    OPTIONAL
   )
 {
@@ -1297,11 +1297,11 @@ EFI_STATUS
 EFIAPI
 EfiLibUninstallAllDriverProtocols2 (
   IN EFI_DRIVER_BINDING_PROTOCOL              *DriverBinding,
-  IN CONST EFI_COMPONENT_NAME_PROTOCOL        *ComponentName,        OPTIONAL
-  IN CONST EFI_COMPONENT_NAME2_PROTOCOL       *ComponentName2,       OPTIONAL
-  IN CONST EFI_DRIVER_CONFIGURATION_PROTOCOL  *DriverConfiguration,  OPTIONAL
-  IN CONST EFI_DRIVER_CONFIGURATION2_PROTOCOL *DriverConfiguration2, OPTIONAL
-  IN CONST EFI_DRIVER_DIAGNOSTICS_PROTOCOL    *DriverDiagnostics,    OPTIONAL
+  IN CONST EFI_COMPONENT_NAME_PROTOCOL        *ComponentName         OPTIONAL,
+  IN CONST EFI_COMPONENT_NAME2_PROTOCOL       *ComponentName2        OPTIONAL,
+  IN CONST EFI_DRIVER_CONFIGURATION_PROTOCOL  *DriverConfiguration   OPTIONAL,
+  IN CONST EFI_DRIVER_CONFIGURATION2_PROTOCOL *DriverConfiguration2  OPTIONAL,
+  IN CONST EFI_DRIVER_DIAGNOSTICS_PROTOCOL    *DriverDiagnostics     OPTIONAL,
   IN CONST EFI_DRIVER_DIAGNOSTICS2_PROTOCOL   *DriverDiagnostics2    OPTIONAL
   )
 {

MdePkg/Library/UefiLib/UefiLib.c

@@ -136,7 +136,7 @@ EfiCreateProtocolNotifyEvent(
   IN  EFI_GUID          *ProtocolGuid,
   IN  EFI_TPL           NotifyTpl,
   IN  EFI_EVENT_NOTIFY  NotifyFunction,
-  IN  VOID              *NotifyContext,  OPTIONAL
+  IN  VOID              *NotifyContext   OPTIONAL,
   OUT VOID              **Registration
   )
 {
@@ -207,7 +207,7 @@ EfiNamedEventListen (
   IN CONST EFI_GUID    *Name,
   IN EFI_TPL           NotifyTpl,
   IN EFI_EVENT_NOTIFY  NotifyFunction,
-  IN CONST VOID        *NotifyContext,  OPTIONAL
+  IN CONST VOID        *NotifyContext   OPTIONAL,
   OUT VOID             *Registration OPTIONAL
   )
 {

MdePkg/Library/UefiLib/UefiLibPrint.c

@@ -600,8 +600,8 @@ EFIAPI
 PrintXY (
   IN UINTN                            PointX,
   IN UINTN                            PointY,
-  IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL    *ForeGround, OPTIONAL
-  IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL    *BackGround, OPTIONAL
+  IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL    *ForeGround  OPTIONAL,
+  IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL    *BackGround  OPTIONAL,
   IN CONST CHAR16                     *Format,
   ...
   )
@@ -679,8 +679,8 @@ EFIAPI
 AsciiPrintXY (
   IN UINTN                            PointX,
   IN UINTN                            PointY,
-  IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL    *ForeGround, OPTIONAL
-  IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL    *BackGround, OPTIONAL
+  IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL    *ForeGround  OPTIONAL,
+  IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL    *BackGround  OPTIONAL,
   IN CONST CHAR8                      *Format,
   ...
   )
@@ -735,7 +735,7 @@ AsciiPrintXY (
 CHAR16*
 EFIAPI
 CatVSPrint (
-  IN  CHAR16  *String, OPTIONAL
+  IN  CHAR16  *String  OPTIONAL,
   IN  CONST CHAR16  *FormatString,
   IN  VA_LIST       Marker
   )
@@ -800,7 +800,7 @@ CatVSPrint (
 CHAR16 *
 EFIAPI
 CatSPrint (
-  IN  CHAR16  *String, OPTIONAL
+  IN  CHAR16  *String  OPTIONAL,
   IN  CONST CHAR16  *FormatString,
   ...
   )
@@ -813,4 +813,3 @@ CatSPrint (
   VA_END (Marker);
   return NewString;
 }
-

MdePkg/Library/UefiLib/UefiNotTiano.c

@@ -69,8 +69,8 @@ EFI_STATUS
 EFIAPI
 EfiCreateEventLegacyBootEx (
   IN  EFI_TPL           NotifyTpl,
-  IN  EFI_EVENT_NOTIFY  NotifyFunction,  OPTIONAL
-  IN  VOID              *NotifyContext,  OPTIONAL
+  IN  EFI_EVENT_NOTIFY  NotifyFunction   OPTIONAL,
+  IN  VOID              *NotifyContext   OPTIONAL,
   OUT EFI_EVENT         *LegacyBootEvent
   )
 {
@@ -164,8 +164,8 @@ EFI_STATUS
 EFIAPI
 EfiCreateEventReadyToBootEx (
   IN  EFI_TPL           NotifyTpl,
-  IN  EFI_EVENT_NOTIFY  NotifyFunction,  OPTIONAL
-  IN  VOID              *NotifyContext,  OPTIONAL
+  IN  EFI_EVENT_NOTIFY  NotifyFunction   OPTIONAL,
+  IN  VOID              *NotifyContext   OPTIONAL,
   OUT EFI_EVENT         *ReadyToBootEvent
   )
 {

MdePkg/Library/UefiScsiLib/UefiScsiLib.c

@@ -133,7 +133,7 @@ EFIAPI
 ScsiTestUnitReadyCommand (
   IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,
   IN     UINT64                Timeout,
-  IN OUT VOID                  *SenseData,  OPTIONAL
+  IN OUT VOID                  *SenseData   OPTIONAL,
   IN OUT UINT8                 *SenseDataLength,
      OUT UINT8                 *HostAdapterStatus,
      OUT UINT8                 *TargetStatus
@@ -269,11 +269,11 @@ EFIAPI
 ScsiInquiryCommandEx (
   IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,
   IN     UINT64                Timeout,
-  IN OUT VOID                  *SenseData,  OPTIONAL
+  IN OUT VOID                  *SenseData   OPTIONAL,
   IN OUT UINT8                 *SenseDataLength,
      OUT UINT8                 *HostAdapterStatus,
      OUT UINT8                 *TargetStatus,
-  IN OUT VOID                  *InquiryDataBuffer,    OPTIONAL
+  IN OUT VOID                  *InquiryDataBuffer     OPTIONAL,
   IN OUT UINT32                *InquiryDataLength,
   IN     BOOLEAN               EnableVitalProductData,
   IN     UINT8                 PageCode
@@ -416,11 +416,11 @@ EFIAPI
 ScsiInquiryCommand (
   IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,
   IN     UINT64                Timeout,
-  IN OUT VOID                  *SenseData,  OPTIONAL
+  IN OUT VOID                  *SenseData   OPTIONAL,
   IN OUT UINT8                 *SenseDataLength,
      OUT UINT8                 *HostAdapterStatus,
      OUT UINT8                 *TargetStatus,
-  IN OUT VOID                  *InquiryDataBuffer,    OPTIONAL
+  IN OUT VOID                  *InquiryDataBuffer     OPTIONAL,
   IN OUT UINT32                *InquiryDataLength,
   IN     BOOLEAN               EnableVitalProductData
   )
@@ -533,13 +533,13 @@ EFIAPI
 ScsiModeSense10Command (
   IN     EFI_SCSI_IO_PROTOCOL    *ScsiIo,
   IN     UINT64                  Timeout,
-  IN OUT VOID                    *SenseData,  OPTIONAL
+  IN OUT VOID                    *SenseData   OPTIONAL,
   IN OUT UINT8                   *SenseDataLength,
      OUT UINT8                   *HostAdapterStatus,
      OUT UINT8                   *TargetStatus,
-  IN OUT VOID                    *DataBuffer, OPTIONAL
+  IN OUT VOID                    *DataBuffer  OPTIONAL,
   IN OUT UINT32                  *DataLength,
-  IN     UINT8                   DBDField,    OPTIONAL
+  IN     UINT8                   DBDField     OPTIONAL,
   IN     UINT8                   PageControl,
   IN     UINT8                   PageCode
   )
@@ -629,7 +629,7 @@ EFIAPI
 ScsiRequestSenseCommand (
   IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,
   IN     UINT64                Timeout,
-  IN OUT VOID                  *SenseData,  OPTIONAL
+  IN OUT VOID                  *SenseData   OPTIONAL,
   IN OUT UINT8                 *SenseDataLength,
      OUT UINT8                 *HostAdapterStatus,
      OUT UINT8                 *TargetStatus
@@ -721,11 +721,11 @@ EFIAPI
 ScsiReadCapacityCommand (
   IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,
   IN     UINT64                Timeout,
-  IN OUT VOID                  *SenseData,    OPTIONAL
+  IN OUT VOID                  *SenseData     OPTIONAL,
   IN OUT UINT8                 *SenseDataLength,
      OUT UINT8                 *HostAdapterStatus,
      OUT UINT8                 *TargetStatus,
-  IN OUT VOID                  *DataBuffer,   OPTIONAL
+  IN OUT VOID                  *DataBuffer    OPTIONAL,
   IN OUT UINT32                *DataLength,
   IN     BOOLEAN               Pmi
   )
@@ -825,11 +825,11 @@ EFIAPI
 ScsiReadCapacity16Command (
   IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,
   IN     UINT64                Timeout,
-  IN OUT VOID                  *SenseData,  OPTIONAL
+  IN OUT VOID                  *SenseData   OPTIONAL,
   IN OUT UINT8                 *SenseDataLength,
      OUT UINT8                 *HostAdapterStatus,
      OUT UINT8                 *TargetStatus,
-  IN OUT VOID                  *DataBuffer, OPTIONAL
+  IN OUT VOID                  *DataBuffer  OPTIONAL,
   IN OUT UINT32                *DataLength,
   IN     BOOLEAN               Pmi
   )
@@ -932,11 +932,11 @@ EFIAPI
 ScsiRead10Command (
   IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,
   IN     UINT64                Timeout,
-  IN OUT VOID                  *SenseData,   OPTIONAL
+  IN OUT VOID                  *SenseData    OPTIONAL,
   IN OUT UINT8                 *SenseDataLength,
      OUT UINT8                 *HostAdapterStatus,
      OUT UINT8                 *TargetStatus,
-  IN OUT VOID                  *DataBuffer,  OPTIONAL
+  IN OUT VOID                  *DataBuffer   OPTIONAL,
   IN OUT UINT32                *DataLength,
   IN     UINT32                StartLba,
   IN     UINT32                SectorSize
@@ -1032,11 +1032,11 @@ EFIAPI
 ScsiWrite10Command (
   IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,
   IN     UINT64                Timeout,
-  IN OUT VOID                  *SenseData,   OPTIONAL
+  IN OUT VOID                  *SenseData    OPTIONAL,
   IN OUT UINT8                 *SenseDataLength,
      OUT UINT8                 *HostAdapterStatus,
      OUT UINT8                 *TargetStatus,
-  IN OUT VOID                  *DataBuffer,  OPTIONAL
+  IN OUT VOID                  *DataBuffer   OPTIONAL,
   IN OUT UINT32                *DataLength,
   IN     UINT32                StartLba,
   IN     UINT32                SectorSize
@@ -1132,11 +1132,11 @@ EFIAPI
 ScsiRead16Command (
   IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,
   IN     UINT64                Timeout,
-  IN OUT VOID                  *SenseData,   OPTIONAL
+  IN OUT VOID                  *SenseData    OPTIONAL,
   IN OUT UINT8                 *SenseDataLength,
      OUT UINT8                 *HostAdapterStatus,
      OUT UINT8                 *TargetStatus,
-  IN OUT VOID                  *DataBuffer,  OPTIONAL
+  IN OUT VOID                  *DataBuffer   OPTIONAL,
   IN OUT UINT32                *DataLength,
   IN     UINT64                StartLba,
   IN     UINT32                SectorSize
@@ -1232,11 +1232,11 @@ EFIAPI
 ScsiWrite16Command (
   IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,
   IN     UINT64                Timeout,
-  IN OUT VOID                  *SenseData,   OPTIONAL
+  IN OUT VOID                  *SenseData    OPTIONAL,
   IN OUT UINT8                 *SenseDataLength,
      OUT UINT8                 *HostAdapterStatus,
      OUT UINT8                 *TargetStatus,
-  IN OUT VOID                  *DataBuffer,  OPTIONAL
+  IN OUT VOID                  *DataBuffer   OPTIONAL,
   IN OUT UINT32                *DataLength,
   IN     UINT64                StartLba,
   IN     UINT32                SectorSize
@@ -1336,7 +1336,7 @@ EFIAPI
 ScsiSecurityProtocolInCommand (
   IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,
   IN     UINT64                Timeout,
-  IN OUT VOID                  *SenseData,   OPTIONAL
+  IN OUT VOID                  *SenseData    OPTIONAL,
   IN OUT UINT8                 *SenseDataLength,
      OUT UINT8                 *HostAdapterStatus,
      OUT UINT8                 *TargetStatus,
@@ -1344,7 +1344,7 @@ ScsiSecurityProtocolInCommand (
   IN     UINT16                SecurityProtocolSpecific,
   IN     BOOLEAN               Inc512,
   IN     UINTN                 DataLength,
-  IN OUT VOID                  *DataBuffer,  OPTIONAL
+  IN OUT VOID                  *DataBuffer   OPTIONAL,
      OUT UINTN                 *TransferLength
   )
 {
@@ -1449,7 +1449,7 @@ EFIAPI
 ScsiSecurityProtocolOutCommand (
   IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,
   IN     UINT64                Timeout,
-  IN OUT VOID                  *SenseData,   OPTIONAL
+  IN OUT VOID                  *SenseData    OPTIONAL,
   IN OUT UINT8                 *SenseDataLength,
      OUT UINT8                 *HostAdapterStatus,
      OUT UINT8                 *TargetStatus,
@@ -1632,11 +1632,11 @@ EFIAPI
 ScsiRead10CommandEx (
   IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,
   IN     UINT64                Timeout,
-  IN OUT VOID                  *SenseData,   OPTIONAL
+  IN OUT VOID                  *SenseData    OPTIONAL,
   IN OUT UINT8                 *SenseDataLength,
      OUT UINT8                 *HostAdapterStatus,
      OUT UINT8                 *TargetStatus,
-  IN OUT VOID                  *DataBuffer,  OPTIONAL
+  IN OUT VOID                  *DataBuffer   OPTIONAL,
   IN OUT UINT32                *DataLength,
   IN     UINT32                StartLba,
   IN     UINT32                SectorSize,
@@ -1816,11 +1816,11 @@ EFIAPI
 ScsiWrite10CommandEx (
   IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,
   IN     UINT64                Timeout,
-  IN OUT VOID                  *SenseData,   OPTIONAL
+  IN OUT VOID                  *SenseData    OPTIONAL,
   IN OUT UINT8                 *SenseDataLength,
      OUT UINT8                 *HostAdapterStatus,
      OUT UINT8                 *TargetStatus,
-  IN OUT VOID                  *DataBuffer,  OPTIONAL
+  IN OUT VOID                  *DataBuffer   OPTIONAL,
   IN OUT UINT32                *DataLength,
   IN     UINT32                StartLba,
   IN     UINT32                SectorSize,
@@ -2000,11 +2000,11 @@ EFIAPI
 ScsiRead16CommandEx (
   IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,
   IN     UINT64                Timeout,
-  IN OUT VOID                  *SenseData,   OPTIONAL
+  IN OUT VOID                  *SenseData    OPTIONAL,
   IN OUT UINT8                 *SenseDataLength,
      OUT UINT8                 *HostAdapterStatus,
      OUT UINT8                 *TargetStatus,
-  IN OUT VOID                  *DataBuffer,  OPTIONAL
+  IN OUT VOID                  *DataBuffer   OPTIONAL,
   IN OUT UINT32                *DataLength,
   IN     UINT64                StartLba,
   IN     UINT32                SectorSize,
@@ -2184,11 +2184,11 @@ EFIAPI
 ScsiWrite16CommandEx (
   IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,
   IN     UINT64                Timeout,
-  IN OUT VOID                  *SenseData,   OPTIONAL
+  IN OUT VOID                  *SenseData    OPTIONAL,
   IN OUT UINT8                 *SenseDataLength,
      OUT UINT8                 *HostAdapterStatus,
      OUT UINT8                 *TargetStatus,
-  IN OUT VOID                  *DataBuffer,  OPTIONAL
+  IN OUT VOID                  *DataBuffer   OPTIONAL,
   IN OUT UINT32                *DataLength,
   IN     UINT64                StartLba,
   IN     UINT32                SectorSize,