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>

MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c

@@ -113,7 +113,7 @@ UINTN mMaxTransferBlockNumber[] = {
 EFI_STATUS
 AtaDevicePassThru (
   IN OUT ATA_DEVICE                       *AtaDevice,
-  IN OUT EFI_ATA_PASS_THRU_COMMAND_PACKET *TaskPacket, OPTIONAL
+  IN OUT EFI_ATA_PASS_THRU_COMMAND_PACKET *TaskPacket  OPTIONAL,
   IN OUT EFI_EVENT                        Event OPTIONAL
   )
 {
@@ -464,7 +464,7 @@ DiscoverAtaDevice (
 EFI_STATUS
 TransferAtaDevice (
   IN OUT ATA_DEVICE                       *AtaDevice,
-  IN OUT EFI_ATA_PASS_THRU_COMMAND_PACKET *TaskPacket, OPTIONAL
+  IN OUT EFI_ATA_PASS_THRU_COMMAND_PACKET *TaskPacket  OPTIONAL,
   IN OUT VOID                             *Buffer,
   IN EFI_LBA                              StartLba,
   IN UINT32                               TransferLength,

MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c

@@ -1854,7 +1854,7 @@ EFIAPI
 PciIoGetBarAttributes (
   IN EFI_PCI_IO_PROTOCOL             * This,
   IN  UINT8                          BarIndex,
-  OUT UINT64                         *Supports, OPTIONAL
+  OUT UINT64                         *Supports  OPTIONAL,
   OUT VOID                           **Resources OPTIONAL
   )
 {
@@ -2084,4 +2084,3 @@ PciDevicesOnTheSamePath (
 
   return (BOOLEAN) (Existed1 || Existed2);
 }
-

MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.h

@@ -602,7 +602,7 @@ EFIAPI
 PciIoGetBarAttributes (
   IN EFI_PCI_IO_PROTOCOL             * This,
   IN  UINT8                          BarIndex,
-  OUT UINT64                         *Supports, OPTIONAL
+  OUT UINT64                         *Supports  OPTIONAL,
   OUT VOID                           **Resources OPTIONAL
   );
 

MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.c

@@ -421,7 +421,7 @@ CreateSerialDevice (
   IN BOOLEAN                        CreateControllerNode,
   IN UINT32                         Instance,
   IN PARENT_IO_PROTOCOL_PTR         ParentIo,
-  IN PCI_SERIAL_PARAMETER           *PciSerialParameter, OPTIONAL
+  IN PCI_SERIAL_PARAMETER           *PciSerialParameter  OPTIONAL,
   IN PCI_DEVICE_INFO                *PciDeviceInfo       OPTIONAL
   )
 {

MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/ComponentName.c

@@ -165,7 +165,7 @@ EFIAPI
 SdMmcPciHcComponentNameGetControllerName (
   IN  EFI_COMPONENT_NAME_PROTOCOL     *This,
   IN  EFI_HANDLE                      ControllerHandle,
-  IN  EFI_HANDLE                      ChildHandle, OPTIONAL
+  IN  EFI_HANDLE                      ChildHandle  OPTIONAL,
   IN  CHAR8                           *Language,
   OUT CHAR16                          **ControllerName
   )

MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h

@@ -648,7 +648,7 @@ EFIAPI
 SdMmcPciHcComponentNameGetControllerName (
   IN  EFI_COMPONENT_NAME_PROTOCOL     *This,
   IN  EFI_HANDLE                      ControllerHandle,
-  IN  EFI_HANDLE                      ChildHandle, OPTIONAL
+  IN  EFI_HANDLE                      ChildHandle  OPTIONAL,
   IN  CHAR8                           *Language,
   OUT CHAR16                          **ControllerName
   );

MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.c

@@ -150,7 +150,7 @@ EFI_STATUS
 UfsPeimTestUnitReady (
   IN     UFS_PEIM_HC_PRIVATE_DATA        *Private,
   IN     UINTN                           Lun,
-     OUT VOID                            *SenseData,  OPTIONAL
+     OUT VOID                            *SenseData   OPTIONAL,
      OUT UINT8                           *SenseDataLength
   )
 {
@@ -202,7 +202,7 @@ UfsPeimReadCapacity (
   IN     UINTN                        Lun,
      OUT VOID                         *DataBuffer,
      OUT UINT32                       *DataLength,
-     OUT VOID                         *SenseData,  OPTIONAL
+     OUT VOID                         *SenseData   OPTIONAL,
      OUT UINT8                        *SenseDataLength
   )
 {
@@ -258,7 +258,7 @@ UfsPeimReadCapacity16 (
   IN     UINTN                        Lun,
      OUT VOID                         *DataBuffer,
      OUT UINT32                       *DataLength,
-     OUT VOID                         *SenseData,  OPTIONAL
+     OUT VOID                         *SenseData   OPTIONAL,
      OUT UINT8                        *SenseDataLength
   )
 {
@@ -320,7 +320,7 @@ UfsPeimRead10 (
   IN     UINT32                       SectorNum,
      OUT VOID                         *DataBuffer,
      OUT UINT32                       *DataLength,
-     OUT VOID                         *SenseData,  OPTIONAL
+     OUT VOID                         *SenseData   OPTIONAL,
      OUT UINT8                        *SenseDataLength
   )
 {
@@ -382,7 +382,7 @@ UfsPeimRead16 (
   IN     UINT32                       SectorNum,
      OUT VOID                         *DataBuffer,
      OUT UINT32                       *DataLength,
-     OUT VOID                         *SenseData,  OPTIONAL
+     OUT VOID                         *SenseData   OPTIONAL,
      OUT UINT8                        *SenseDataLength
   )
 {

MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c

@@ -60,8 +60,8 @@ UsbIoControlTransfer (
   IN  EFI_USB_DEVICE_REQUEST  *Request,
   IN  EFI_USB_DATA_DIRECTION  Direction,
   IN  UINT32                  Timeout,
-  IN  OUT VOID                *Data,      OPTIONAL
-  IN  UINTN                   DataLength, OPTIONAL
+  IN  OUT VOID                *Data       OPTIONAL,
+  IN  UINTN                   DataLength  OPTIONAL,
   OUT UINT32                  *UsbStatus
   )
 {
@@ -405,9 +405,9 @@ UsbIoAsyncInterruptTransfer (
   IN EFI_USB_IO_PROTOCOL              *This,
   IN UINT8                            Endpoint,
   IN BOOLEAN                          IsNewTransfer,
-  IN UINTN                            PollInterval,       OPTIONAL
-  IN UINTN                            DataLength,         OPTIONAL
-  IN EFI_ASYNC_USB_TRANSFER_CALLBACK  Callback,           OPTIONAL
+  IN UINTN                            PollInterval        OPTIONAL,
+  IN UINTN                            DataLength          OPTIONAL,
+  IN EFI_ASYNC_USB_TRANSFER_CALLBACK  Callback            OPTIONAL,
   IN VOID                             *Context            OPTIONAL
   )
 {

MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h

@@ -392,8 +392,8 @@ UsbIoControlTransfer (
   IN  EFI_USB_DEVICE_REQUEST  *Request,
   IN  EFI_USB_DATA_DIRECTION  Direction,
   IN  UINT32                  Timeout,
-  IN  OUT VOID                *Data,      OPTIONAL
-  IN  UINTN                   DataLength, OPTIONAL
+  IN  OUT VOID                *Data       OPTIONAL,
+  IN  UINTN                   DataLength  OPTIONAL,
   OUT UINT32                  *UsbStatus
   );
 
@@ -477,9 +477,9 @@ UsbIoAsyncInterruptTransfer (
   IN EFI_USB_IO_PROTOCOL              *This,
   IN UINT8                            Endpoint,
   IN BOOLEAN                          IsNewTransfer,
-  IN UINTN                            PollInterval,       OPTIONAL
-  IN UINTN                            DataLength,         OPTIONAL
-  IN EFI_ASYNC_USB_TRANSFER_CALLBACK  Callback,           OPTIONAL
+  IN UINTN                            PollInterval        OPTIONAL,
+  IN UINTN                            DataLength          OPTIONAL,
+  IN EFI_ASYNC_USB_TRANSFER_CALLBACK  Callback            OPTIONAL,
   IN VOID                             *Context            OPTIONAL
   );
 

MdeModulePkg/Bus/Usb/UsbBusPei/UsbIoPeim.c

@@ -38,7 +38,7 @@ PeiUsbControlTransfer (
   IN     EFI_USB_DEVICE_REQUEST    *Request,
   IN     EFI_USB_DATA_DIRECTION    Direction,
   IN     UINT32                    Timeout,
-  IN OUT VOID                      *Data,      OPTIONAL
+  IN OUT VOID                      *Data       OPTIONAL,
   IN     UINTN                     DataLength  OPTIONAL
   )
 {

MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.h

@@ -142,7 +142,7 @@ PeiUsbControlTransfer (
   IN     EFI_USB_DEVICE_REQUEST    *Request,
   IN     EFI_USB_DATA_DIRECTION    Direction,
   IN     UINT32                    Timeout,
-  IN OUT VOID                      *Data,      OPTIONAL
+  IN OUT VOID                      *Data       OPTIONAL,
   IN     UINTN                     DataLength  OPTIONAL
   );
 

MdeModulePkg/Core/Dxe/DxeMain.h

@@ -1545,8 +1545,8 @@ EFIAPI
 CoreCreateEvent (
   IN UINT32                   Type,
   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               *Event
   );
 
@@ -1577,9 +1577,9 @@ EFIAPI
 CoreCreateEventEx (
   IN UINT32                   Type,
   IN EFI_TPL                  NotifyTpl,
-  IN EFI_EVENT_NOTIFY         NotifyFunction, OPTIONAL
-  IN CONST VOID               *NotifyContext, OPTIONAL
-  IN CONST EFI_GUID           *EventGroup,    OPTIONAL
+  IN EFI_EVENT_NOTIFY         NotifyFunction  OPTIONAL,
+  IN CONST VOID               *NotifyContext  OPTIONAL,
+  IN CONST EFI_GUID           *EventGroup     OPTIONAL,
   OUT EFI_EVENT               *Event
   );
 
@@ -1608,9 +1608,9 @@ EFIAPI
 CoreCreateEventInternal (
   IN UINT32                   Type,
   IN EFI_TPL                  NotifyTpl,
-  IN EFI_EVENT_NOTIFY         NotifyFunction, OPTIONAL
-  IN CONST VOID               *NotifyContext, OPTIONAL
-  IN CONST EFI_GUID           *EventGroup,    OPTIONAL
+  IN EFI_EVENT_NOTIFY         NotifyFunction  OPTIONAL,
+  IN CONST VOID               *NotifyContext  OPTIONAL,
+  IN CONST EFI_GUID           *EventGroup     OPTIONAL,
   OUT EFI_EVENT               *Event
   );
 

MdeModulePkg/Core/Dxe/Event/Event.c

@@ -294,8 +294,8 @@ EFIAPI
 CoreCreateEvent (
   IN UINT32                   Type,
   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               *Event
   )
 {
@@ -329,9 +329,9 @@ EFIAPI
 CoreCreateEventEx (
   IN UINT32                   Type,
   IN EFI_TPL                  NotifyTpl,
-  IN EFI_EVENT_NOTIFY         NotifyFunction, OPTIONAL
-  IN CONST VOID               *NotifyContext, OPTIONAL
-  IN CONST EFI_GUID           *EventGroup,    OPTIONAL
+  IN EFI_EVENT_NOTIFY         NotifyFunction  OPTIONAL,
+  IN CONST VOID               *NotifyContext  OPTIONAL,
+  IN CONST EFI_GUID           *EventGroup     OPTIONAL,
   OUT EFI_EVENT               *Event
   )
 {
@@ -374,9 +374,9 @@ EFIAPI
 CoreCreateEventInternal (
   IN UINT32                   Type,
   IN EFI_TPL                  NotifyTpl,
-  IN EFI_EVENT_NOTIFY         NotifyFunction, OPTIONAL
-  IN CONST VOID               *NotifyContext, OPTIONAL
-  IN CONST EFI_GUID           *EventGroup,    OPTIONAL
+  IN EFI_EVENT_NOTIFY         NotifyFunction  OPTIONAL,
+  IN CONST VOID               *NotifyContext  OPTIONAL,
+  IN CONST EFI_GUID           *EventGroup     OPTIONAL,
   OUT EFI_EVENT               *Event
   )
 {
@@ -781,4 +781,3 @@ CoreCloseEvent (
 
   return Status;
 }
-

MdeModulePkg/Core/Pei/FwVol/FwVol.c

@@ -264,7 +264,7 @@ FileHandleToVolume (
 EFI_STATUS
 FindFileEx (
   IN  CONST EFI_PEI_FV_HANDLE        FvHandle,
-  IN  CONST EFI_GUID                 *FileName,   OPTIONAL
+  IN  CONST EFI_GUID                 *FileName    OPTIONAL,
   IN        EFI_FV_FILETYPE          SearchType,
   IN OUT    EFI_PEI_FILE_HANDLE      *FileHandle,
   IN OUT    EFI_PEI_FILE_HANDLE      *AprioriFile  OPTIONAL

MdeModulePkg/Core/Pei/FwVol/FwVol.h

@@ -296,7 +296,7 @@ FvHandleToCoreHandle (
 EFI_STATUS
 FindFileEx (
   IN  CONST EFI_PEI_FV_HANDLE        FvHandle,
-  IN  CONST EFI_GUID                 *FileName,   OPTIONAL
+  IN  CONST EFI_GUID                 *FileName    OPTIONAL,
   IN        EFI_FV_FILETYPE          SearchType,
   IN OUT    EFI_PEI_FILE_HANDLE      *FileHandle,
   IN OUT    EFI_PEI_FILE_HANDLE      *AprioriFile  OPTIONAL

MdeModulePkg/Core/Pei/Image/Image.c

@@ -590,8 +590,8 @@ EFI_STATUS
 PeiLoadImageLoadImage (
   IN     CONST EFI_PEI_SERVICES       **PeiServices,
   IN     EFI_PEI_FILE_HANDLE          FileHandle,
-  OUT    EFI_PHYSICAL_ADDRESS         *ImageAddressArg,  OPTIONAL
-  OUT    UINT64                       *ImageSizeArg,     OPTIONAL
+  OUT    EFI_PHYSICAL_ADDRESS         *ImageAddressArg   OPTIONAL,
+  OUT    UINT64                       *ImageSizeArg      OPTIONAL,
   OUT    EFI_PHYSICAL_ADDRESS         *EntryPoint,
   OUT    UINT32                       *AuthenticationState
   )
@@ -771,8 +771,8 @@ EFIAPI
 PeiLoadImageLoadImageWrapper (
   IN     CONST EFI_PEI_LOAD_FILE_PPI  *This,
   IN     EFI_PEI_FILE_HANDLE          FileHandle,
-  OUT    EFI_PHYSICAL_ADDRESS         *ImageAddressArg,  OPTIONAL
-  OUT    UINT64                       *ImageSizeArg,     OPTIONAL
+  OUT    EFI_PHYSICAL_ADDRESS         *ImageAddressArg   OPTIONAL,
+  OUT    UINT64                       *ImageSizeArg      OPTIONAL,
   OUT    EFI_PHYSICAL_ADDRESS         *EntryPoint,
   OUT    UINT32                       *AuthenticationState
   )

MdeModulePkg/Core/Pei/PeiMain.h

@@ -1437,8 +1437,8 @@ EFIAPI
 PeiLoadImageLoadImageWrapper (
   IN     CONST EFI_PEI_LOAD_FILE_PPI  *This,
   IN     EFI_PEI_FILE_HANDLE          FileHandle,
-  OUT    EFI_PHYSICAL_ADDRESS         *ImageAddressArg,  OPTIONAL
-  OUT    UINT64                       *ImageSizeArg,     OPTIONAL
+  OUT    EFI_PHYSICAL_ADDRESS         *ImageAddressArg   OPTIONAL,
+  OUT    UINT64                       *ImageSizeArg      OPTIONAL,
   OUT    EFI_PHYSICAL_ADDRESS         *EntryPoint,
   OUT    UINT32                       *AuthenticationState
   );

MdeModulePkg/Core/PiSmmCore/Dispatcher.c

@@ -1248,8 +1248,8 @@ EFI_STATUS
 EFIAPI
 SmmDriverDispatchHandler (
   IN     EFI_HANDLE  DispatchHandle,
-  IN     CONST VOID  *Context,        OPTIONAL
-  IN OUT VOID        *CommBuffer,     OPTIONAL
+  IN     CONST VOID  *Context         OPTIONAL,
+  IN OUT VOID        *CommBuffer      OPTIONAL,
   IN OUT UINTN       *CommBufferSize  OPTIONAL
   )
 {

MdeModulePkg/Core/PiSmmCore/PiSmmCore.c

@@ -158,8 +158,8 @@ EFI_STATUS
 EFIAPI
 SmmLegacyBootHandler (
   IN     EFI_HANDLE  DispatchHandle,
-  IN     CONST VOID  *Context,        OPTIONAL
-  IN OUT VOID        *CommBuffer,     OPTIONAL
+  IN     CONST VOID  *Context         OPTIONAL,
+  IN OUT VOID        *CommBuffer      OPTIONAL,
   IN OUT UINTN       *CommBufferSize  OPTIONAL
   )
 {
@@ -213,8 +213,8 @@ EFI_STATUS
 EFIAPI
 SmmExitBootServicesHandler (
   IN     EFI_HANDLE  DispatchHandle,
-  IN     CONST VOID  *Context,        OPTIONAL
-  IN OUT VOID        *CommBuffer,     OPTIONAL
+  IN     CONST VOID  *Context         OPTIONAL,
+  IN OUT VOID        *CommBuffer      OPTIONAL,
   IN OUT UINTN       *CommBufferSize  OPTIONAL
   )
 {
@@ -297,8 +297,8 @@ EFI_STATUS
 EFIAPI
 SmmReadyToBootHandler (
   IN     EFI_HANDLE  DispatchHandle,
-  IN     CONST VOID  *Context,        OPTIONAL
-  IN OUT VOID        *CommBuffer,     OPTIONAL
+  IN     CONST VOID  *Context         OPTIONAL,
+  IN OUT VOID        *CommBuffer      OPTIONAL,
   IN OUT UINTN       *CommBufferSize  OPTIONAL
   )
 {
@@ -342,8 +342,8 @@ EFI_STATUS
 EFIAPI
 SmmReadyToLockHandler (
   IN     EFI_HANDLE  DispatchHandle,
-  IN     CONST VOID  *Context,        OPTIONAL
-  IN OUT VOID        *CommBuffer,     OPTIONAL
+  IN     CONST VOID  *Context         OPTIONAL,
+  IN OUT VOID        *CommBuffer      OPTIONAL,
   IN OUT UINTN       *CommBufferSize  OPTIONAL
   )
 {
@@ -428,8 +428,8 @@ EFI_STATUS
 EFIAPI
 SmmEndOfDxeHandler (
   IN     EFI_HANDLE  DispatchHandle,
-  IN     CONST VOID  *Context,        OPTIONAL
-  IN OUT VOID        *CommBuffer,     OPTIONAL
+  IN     CONST VOID  *Context         OPTIONAL,
+  IN OUT VOID        *CommBuffer      OPTIONAL,
   IN OUT UINTN       *CommBufferSize  OPTIONAL
   )
 {
@@ -499,8 +499,8 @@ EFI_STATUS
 EFIAPI
 SmmS3SmmInitDoneHandler (
   IN     EFI_HANDLE  DispatchHandle,
-  IN     CONST VOID  *Context,        OPTIONAL
-  IN OUT VOID        *CommBuffer,     OPTIONAL
+  IN     CONST VOID  *Context         OPTIONAL,
+  IN OUT VOID        *CommBuffer      OPTIONAL,
   IN OUT UINTN       *CommBufferSize  OPTIONAL
   )
 {
@@ -558,8 +558,8 @@ EFI_STATUS
 EFIAPI
 SmmEndOfS3ResumeHandler (
   IN     EFI_HANDLE  DispatchHandle,
-  IN     CONST VOID  *Context,        OPTIONAL
-  IN OUT VOID        *CommBuffer,     OPTIONAL
+  IN     CONST VOID  *Context         OPTIONAL,
+  IN OUT VOID        *CommBuffer      OPTIONAL,
   IN OUT UINTN       *CommBufferSize  OPTIONAL
   )
 {

MdeModulePkg/Core/PiSmmCore/PiSmmCore.h

@@ -689,8 +689,8 @@ EFI_STATUS
 EFIAPI
 SmmDriverDispatchHandler (
   IN     EFI_HANDLE               DispatchHandle,
-  IN     CONST VOID               *Context,        OPTIONAL
-  IN OUT VOID                     *CommBuffer,     OPTIONAL
+  IN     CONST VOID               *Context         OPTIONAL,
+  IN OUT VOID                     *CommBuffer      OPTIONAL,
   IN OUT UINTN                    *CommBufferSize  OPTIONAL
   );
 
@@ -711,8 +711,8 @@ EFI_STATUS
 EFIAPI
 SmmLegacyBootHandler (
   IN     EFI_HANDLE               DispatchHandle,
-  IN     CONST VOID               *Context,        OPTIONAL
-  IN OUT VOID                     *CommBuffer,     OPTIONAL
+  IN     CONST VOID               *Context         OPTIONAL,
+  IN OUT VOID                     *CommBuffer      OPTIONAL,
   IN OUT UINTN                    *CommBufferSize  OPTIONAL
   );
 
@@ -733,8 +733,8 @@ EFI_STATUS
 EFIAPI
 SmmReadyToLockHandler (
   IN     EFI_HANDLE               DispatchHandle,
-  IN     CONST VOID               *Context,        OPTIONAL
-  IN OUT VOID                     *CommBuffer,     OPTIONAL
+  IN     CONST VOID               *Context         OPTIONAL,
+  IN OUT VOID                     *CommBuffer      OPTIONAL,
   IN OUT UINTN                    *CommBufferSize  OPTIONAL
   );
 
@@ -755,8 +755,8 @@ EFI_STATUS
 EFIAPI
 SmmEndOfDxeHandler (
   IN     EFI_HANDLE               DispatchHandle,
-  IN     CONST VOID               *Context,        OPTIONAL
-  IN OUT VOID                     *CommBuffer,     OPTIONAL
+  IN     CONST VOID               *Context         OPTIONAL,
+  IN OUT VOID                     *CommBuffer      OPTIONAL,
   IN OUT UINTN                    *CommBufferSize  OPTIONAL
   );
 
@@ -777,8 +777,8 @@ EFI_STATUS
 EFIAPI
 SmmExitBootServicesHandler (
   IN     EFI_HANDLE               DispatchHandle,
-  IN     CONST VOID               *Context,        OPTIONAL
-  IN OUT VOID                     *CommBuffer,     OPTIONAL
+  IN     CONST VOID               *Context         OPTIONAL,
+  IN OUT VOID                     *CommBuffer      OPTIONAL,
   IN OUT UINTN                    *CommBufferSize  OPTIONAL
   );
 
@@ -799,8 +799,8 @@ EFI_STATUS
 EFIAPI
 SmmReadyToBootHandler (
   IN     EFI_HANDLE               DispatchHandle,
-  IN     CONST VOID               *Context,        OPTIONAL
-  IN OUT VOID                     *CommBuffer,     OPTIONAL
+  IN     CONST VOID               *Context         OPTIONAL,
+  IN OUT VOID                     *CommBuffer      OPTIONAL,
   IN OUT UINTN                    *CommBufferSize  OPTIONAL
   );
 
@@ -822,8 +822,8 @@ EFI_STATUS
 EFIAPI
 SmmS3SmmInitDoneHandler (
   IN     EFI_HANDLE  DispatchHandle,
-  IN     CONST VOID  *Context,        OPTIONAL
-  IN OUT VOID        *CommBuffer,     OPTIONAL
+  IN     CONST VOID  *Context         OPTIONAL,
+  IN OUT VOID        *CommBuffer      OPTIONAL,
   IN OUT UINTN       *CommBufferSize  OPTIONAL
   );
 
@@ -845,8 +845,8 @@ EFI_STATUS
 EFIAPI
 SmmEndOfS3ResumeHandler (
   IN     EFI_HANDLE  DispatchHandle,
-  IN     CONST VOID  *Context,        OPTIONAL
-  IN OUT VOID        *CommBuffer,     OPTIONAL
+  IN     CONST VOID  *Context         OPTIONAL,
+  IN OUT VOID        *CommBuffer      OPTIONAL,
   IN OUT UINTN       *CommBufferSize  OPTIONAL
   );
 
@@ -1175,7 +1175,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
   );
 
@@ -1202,7 +1202,7 @@ SmiHandlerProfileUnregisterHandler (
   IN SMI_HANDLER_PROFILE_PROTOCOL   *This,
   IN EFI_GUID                       *HandlerGuid,
   IN EFI_SMM_HANDLER_ENTRY_POINT2   Handler,
-  IN VOID                           *Context, OPTIONAL
+  IN VOID                           *Context  OPTIONAL,
   IN UINTN                          ContextSize OPTIONAL
   );
 

MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c

@@ -1185,7 +1185,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
   )
 {
@@ -1262,7 +1262,7 @@ SmiHandlerProfileUnregisterHandler (
   IN SMI_HANDLER_PROFILE_PROTOCOL   *This,
   IN EFI_GUID                       *HandlerGuid,
   IN EFI_SMM_HANDLER_ENTRY_POINT2   Handler,
-  IN VOID                           *Context, OPTIONAL
+  IN VOID                           *Context  OPTIONAL,
   IN UINTN                          ContextSize OPTIONAL
   )
 {
@@ -1364,4 +1364,3 @@ SmmCoreInitializeSmiHandlerProfile (
     ASSERT_EFI_ERROR (Status);
   }
 }
-

MdeModulePkg/Include/Guid/Performance.h

@@ -158,9 +158,9 @@ typedef struct {
 typedef
 EFI_STATUS
 (EFIAPI * PERFORMANCE_START_GAUGE)(
-  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
   );
 
@@ -191,9 +191,9 @@ EFI_STATUS
 typedef
 EFI_STATUS
 (EFIAPI * PERFORMANCE_END_GAUGE)(
-  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
   );
 
@@ -249,9 +249,9 @@ EFI_STATUS
 typedef
 EFI_STATUS
 (EFIAPI * PERFORMANCE_START_GAUGE_EX)(
-  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
   );
@@ -285,9 +285,9 @@ EFI_STATUS
 typedef
 EFI_STATUS
 (EFIAPI * PERFORMANCE_END_GAUGE_EX)(
-  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
   );

MdeModulePkg/Include/Guid/PerformanceMeasurement.h

@@ -53,11 +53,11 @@ typedef enum {
 typedef
 EFI_STATUS
 (EFIAPI *CREATE_PERFORMANCE_MEASUREMENT)(
-  IN CONST VOID                        *CallerIdentifier, OPTIONAL
-  IN CONST VOID                        *Guid,     OPTIONAL
-  IN CONST CHAR8                       *String,   OPTIONAL
-  IN       UINT64                      TimeStamp, OPTIONAL
-  IN       UINT64                      Address,   OPTIONAL
+  IN CONST VOID                        *CallerIdentifier  OPTIONAL,
+  IN CONST VOID                        *Guid      OPTIONAL,
+  IN CONST CHAR8                       *String    OPTIONAL,
+  IN       UINT64                      TimeStamp  OPTIONAL,
+  IN       UINT64                      Address    OPTIONAL,
   IN       UINT32                      Identifier,
   IN       PERF_MEASUREMENT_ATTRIBUTE  Attribute
   );

MdeModulePkg/Include/Guid/SmiHandlerProfile.h

@@ -172,7 +172,7 @@ EFI_STATUS
   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
   );
 
@@ -199,7 +199,7 @@ EFI_STATUS
   IN SMI_HANDLER_PROFILE_PROTOCOL   *This,
   IN EFI_GUID                       *HandlerGuid,
   IN EFI_SMM_HANDLER_ENTRY_POINT2   Handler,
-  IN VOID                           *Context, OPTIONAL
+  IN VOID                           *Context  OPTIONAL,
   IN UINTN                          ContextSize OPTIONAL
   );
 

MdeModulePkg/Include/Library/CustomizedDisplayLib.h

@@ -103,7 +103,7 @@ UpdateStatusBar (
 VOID
 EFIAPI
 CreateDialog (
-  OUT EFI_INPUT_KEY  *Key,        OPTIONAL
+  OUT EFI_INPUT_KEY  *Key         OPTIONAL,
   ...
   );
 

MdeModulePkg/Include/Library/DebugAgentLib.h

@@ -71,7 +71,7 @@ VOID
 EFIAPI
 InitializeDebugAgent (
   IN UINT32                InitFlag,
-  IN VOID                  *Context, OPTIONAL
+  IN VOID                  *Context  OPTIONAL,
   IN DEBUG_AGENT_CONTINUE  Function  OPTIONAL
   );
 

MdeModulePkg/Include/Library/FileExplorerLib.h

@@ -33,8 +33,8 @@ EFI_STATUS
 EFIAPI
 ChooseFile (
   IN  EFI_DEVICE_PATH_PROTOCOL  *RootDirectory,
-  IN  CHAR16                    *FileType,  OPTIONAL
-  IN  CHOOSE_HANDLER            ChooseHandler,  OPTIONAL
+  IN  CHAR16                    *FileType   OPTIONAL,
+  IN  CHOOSE_HANDLER            ChooseHandler   OPTIONAL,
   OUT EFI_DEVICE_PATH_PROTOCOL  **File  OPTIONAL
   );
 

MdeModulePkg/Include/Library/FrameBufferBltLib.h

@@ -73,7 +73,7 @@ RETURN_STATUS
 EFIAPI
 FrameBufferBlt (
   IN     FRAME_BUFFER_CONFIGURE             *Configure,
-  IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer, OPTIONAL
+  IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer  OPTIONAL,
   IN     EFI_GRAPHICS_OUTPUT_BLT_OPERATION  BltOperation,
   IN     UINTN                              SourceX,
   IN     UINTN                              SourceY,

MdeModulePkg/Include/Library/HiiLib.h

@@ -117,7 +117,7 @@ EFI_STRING_ID
 EFIAPI
 HiiSetString (
   IN EFI_HII_HANDLE    HiiHandle,
-  IN EFI_STRING_ID     StringId,            OPTIONAL
+  IN EFI_STRING_ID     StringId             OPTIONAL,
   IN CONST EFI_STRING  String,
   IN CONST CHAR8       *SupportedLanguages  OPTIONAL
   )
@@ -332,8 +332,8 @@ HiiGetSupportedLanguages (
 EFI_STRING
 EFIAPI
 HiiConstructConfigHdr (
-  IN CONST EFI_GUID  *Guid,  OPTIONAL
-  IN CONST CHAR16    *Name,  OPTIONAL
+  IN CONST EFI_GUID  *Guid   OPTIONAL,
+  IN CONST CHAR16    *Name   OPTIONAL,
   IN EFI_HANDLE      DriverHandle
   );
 
@@ -356,7 +356,7 @@ HiiConstructConfigHdr (
 BOOLEAN
 EFIAPI
 HiiSetToDefaults (
-  IN CONST EFI_STRING  Request,  OPTIONAL
+  IN CONST EFI_STRING  Request   OPTIONAL,
   IN UINT16            DefaultId
   );
 
@@ -397,7 +397,7 @@ BOOLEAN
 EFIAPI
 HiiIsConfigHdrMatch (
   IN CONST EFI_STRING  ConfigHdr,
-  IN CONST EFI_GUID    *Guid,     OPTIONAL
+  IN CONST EFI_GUID    *Guid      OPTIONAL,
   IN CONST CHAR16      *Name      OPTIONAL
   );
 
@@ -419,8 +419,8 @@ HiiIsConfigHdrMatch (
 BOOLEAN
 EFIAPI
 HiiGetBrowserData (
-  IN CONST EFI_GUID  *VariableGuid,  OPTIONAL
-  IN CONST CHAR16    *VariableName,  OPTIONAL
+  IN CONST EFI_GUID  *VariableGuid   OPTIONAL,
+  IN CONST CHAR16    *VariableName   OPTIONAL,
   IN UINTN           BufferSize,
   OUT UINT8          *Buffer
   );
@@ -449,8 +449,8 @@ HiiGetBrowserData (
 BOOLEAN
 EFIAPI
 HiiSetBrowserData (
-  IN CONST EFI_GUID  *VariableGuid, OPTIONAL
-  IN CONST CHAR16    *VariableName, OPTIONAL
+  IN CONST EFI_GUID  *VariableGuid  OPTIONAL,
+  IN CONST CHAR16    *VariableName  OPTIONAL,
   IN UINTN           BufferSize,
   IN CONST UINT8     *Buffer,
   IN CONST CHAR16    *RequestElement  OPTIONAL
@@ -642,7 +642,7 @@ EFIAPI
 HiiCreateGuidOpCode (
   IN VOID            *OpCodeHandle,
   IN CONST EFI_GUID  *Guid,
-  IN CONST VOID      *GuidOpCode,    OPTIONAL
+  IN CONST VOID      *GuidOpCode     OPTIONAL,
   IN UINTN           OpCodeSize
   );
 
@@ -769,7 +769,7 @@ HiiCreateGotoExOpCode (
   IN UINT8            QuestionFlags,
   IN EFI_QUESTION_ID  QuestionId,
   IN EFI_QUESTION_ID  RefQuestionId,
-  IN EFI_GUID         *RefFormSetId,    OPTIONAL
+  IN EFI_GUID         *RefFormSetId     OPTIONAL,
   IN EFI_STRING_ID    RefDevicePath
   );
 
@@ -1029,8 +1029,8 @@ EFIAPI
 HiiCreateDateOpCode (
   IN VOID             *OpCodeHandle,
   IN EFI_QUESTION_ID  QuestionId,
-  IN EFI_VARSTORE_ID  VarStoreId,   OPTIONAL
-  IN UINT16           VarOffset,    OPTIONAL
+  IN EFI_VARSTORE_ID  VarStoreId    OPTIONAL,
+  IN UINT16           VarOffset     OPTIONAL,
   IN EFI_STRING_ID    Prompt,
   IN EFI_STRING_ID    Help,
   IN UINT8            QuestionFlags,
@@ -1068,8 +1068,8 @@ EFIAPI
 HiiCreateTimeOpCode (
   IN VOID             *OpCodeHandle,
   IN EFI_QUESTION_ID  QuestionId,
-  IN EFI_VARSTORE_ID  VarStoreId,   OPTIONAL
-  IN UINT16           VarOffset,    OPTIONAL
+  IN EFI_VARSTORE_ID  VarStoreId    OPTIONAL,
+  IN UINT16           VarOffset     OPTIONAL,
   IN EFI_STRING_ID    Prompt,
   IN EFI_STRING_ID    Help,
   IN UINT8            QuestionFlags,
@@ -1138,7 +1138,7 @@ EFI_STATUS
 EFIAPI
 HiiUpdateForm (
   IN EFI_HII_HANDLE  HiiHandle,
-  IN EFI_GUID        *FormSetGuid,        OPTIONAL
+  IN EFI_GUID        *FormSetGuid         OPTIONAL,
   IN EFI_FORM_ID     FormId,
   IN VOID            *StartOpCodeHandle,
   IN VOID            *EndOpCodeHandle     OPTIONAL

MdeModulePkg/Include/Library/LockBoxLib.h

@@ -117,7 +117,7 @@ RETURN_STATUS
 EFIAPI
 RestoreLockBox (
   IN  GUID                        *Guid,
-  IN  VOID                        *Buffer, OPTIONAL
+  IN  VOID                        *Buffer  OPTIONAL,
   IN  OUT UINTN                   *Length  OPTIONAL
   );
 

MdeModulePkg/Include/Library/OemHookStatusCodeLib.h

@@ -65,9 +65,8 @@ OemHookStatusCodeReport (
   IN EFI_STATUS_CODE_TYPE     CodeType,
   IN EFI_STATUS_CODE_VALUE    Value,
   IN UINT32                   Instance,
-  IN EFI_GUID                 *CallerId, OPTIONAL
+  IN EFI_GUID                 *CallerId  OPTIONAL,
   IN EFI_STATUS_CODE_DATA     *Data      OPTIONAL
   );
 
 #endif // __OEM_HOOK_STATUSCODE_LIB__
-

MdeModulePkg/Include/Library/SecurityManagementLib.h

@@ -261,7 +261,7 @@ EFIAPI
 ExecuteSecurity2Handlers (
   IN  UINT32                           AuthenticationOperation,
   IN  UINT32                           AuthenticationStatus,
-  IN  CONST EFI_DEVICE_PATH_PROTOCOL   *File, OPTIONAL
+  IN  CONST EFI_DEVICE_PATH_PROTOCOL   *File  OPTIONAL,
   IN  VOID                             *FileBuffer,
   IN  UINTN                            FileSize,
   IN  BOOLEAN                          BootPolicy

MdeModulePkg/Include/Library/UefiBootManagerLib.h

@@ -322,7 +322,7 @@ EfiBootManagerStartHotkeyService (
 EFI_STATUS
 EFIAPI
 EfiBootManagerAddKeyOptionVariable (
-  OUT EFI_BOOT_MANAGER_KEY_OPTION *AddedOption,   OPTIONAL
+  OUT EFI_BOOT_MANAGER_KEY_OPTION *AddedOption    OPTIONAL,
   IN UINT16                       BootOptionNumber,
   IN UINT32                       Modifier,
   ...
@@ -341,7 +341,7 @@ EfiBootManagerAddKeyOptionVariable (
 EFI_STATUS
 EFIAPI
 EfiBootManagerDeleteKeyOptionVariable (
-  IN EFI_BOOT_MANAGER_KEY_OPTION *DeletedOption, OPTIONAL
+  IN EFI_BOOT_MANAGER_KEY_OPTION *DeletedOption  OPTIONAL,
   IN UINT32                      Modifier,
   ...
   );

MdeModulePkg/Include/Protocol/FileExplorer.h

@@ -55,8 +55,8 @@ typedef
 EFI_STATUS
 (EFIAPI   *CHOOSE_FILE) (
   IN  EFI_DEVICE_PATH_PROTOCOL  *RootDirectory,
-  IN  CHAR16                    *FileType,  OPTIONAL
-  IN  CHOOSE_HANDLER            ChooseHandler,  OPTIONAL
+  IN  CHAR16                    *FileType   OPTIONAL,
+  IN  CHOOSE_HANDLER            ChooseHandler   OPTIONAL,
   OUT EFI_DEVICE_PATH_PROTOCOL  **File  OPTIONAL
   );
 

MdeModulePkg/Library/BaseHobLibNull/BaseHobLibNull.c

@@ -408,7 +408,7 @@ BuildFv3Hob (
   IN          UINT64                      Length,
   IN          UINT32                      AuthenticationStatus,
   IN          BOOLEAN                     ExtractedFv,
-  IN CONST    EFI_GUID                    *FvName, OPTIONAL
+  IN CONST    EFI_GUID                    *FvName  OPTIONAL,
   IN CONST    EFI_GUID                    *FileName OPTIONAL
   )
 {

MdeModulePkg/Library/BrotliCustomDecompressLib/GuidedSectionExtraction.c

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

MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c

@@ -404,7 +404,7 @@ UpdateStatusBar (
 VOID
 EFIAPI
 CreateDialog (
-  OUT EFI_INPUT_KEY  *Key,        OPTIONAL
+  OUT EFI_INPUT_KEY  *Key         OPTIONAL,
   ...
   )
 {
@@ -949,4 +949,3 @@ CustomizedDisplayLibDestructor (
 
   return EFI_SUCCESS;
 }
-

MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.c

@@ -34,7 +34,7 @@ VOID
 EFIAPI
 InitializeDebugAgent (
   IN UINT32                InitFlag,
-  IN VOID                  *Context, OPTIONAL
+  IN VOID                  *Context  OPTIONAL,
   IN DEBUG_AGENT_CONTINUE  Function  OPTIONAL
   )
 {
@@ -63,4 +63,3 @@ SaveAndSetDebugTimerInterrupt (
 {
   return FALSE;
 }
-

MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c

@@ -91,7 +91,7 @@ RecordFmpCapsuleStatusVariable (
   IN EFI_STATUS                                    CapsuleStatus,
   IN UINTN                                         PayloadIndex,
   IN EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER  *ImageHeader,
-  IN EFI_DEVICE_PATH_PROTOCOL                      *FmpDevicePath, OPTIONAL
+  IN EFI_DEVICE_PATH_PROTOCOL                      *FmpDevicePath  OPTIONAL,
   IN CHAR16                                        *CapFileName    OPTIONAL
   );
 
@@ -651,8 +651,8 @@ EFI_STATUS
 GetFmpHandleBufferByType (
   IN     EFI_GUID                     *UpdateImageTypeId,
   IN     UINT64                       UpdateHardwareInstance,
-  OUT    UINTN                        *NoHandles, OPTIONAL
-  OUT    EFI_HANDLE                   **HandleBuf, OPTIONAL
+  OUT    UINTN                        *NoHandles  OPTIONAL,
+  OUT    EFI_HANDLE                   **HandleBuf  OPTIONAL,
   OUT    BOOLEAN                      **ResetRequiredBuf OPTIONAL
   )
 {
@@ -1083,7 +1083,7 @@ StartFmpImage (
 **/
 VOID
 RecordFmpCapsuleStatus (
-  IN EFI_HANDLE                                    Handle,  OPTIONAL
+  IN EFI_HANDLE                                    Handle   OPTIONAL,
   IN EFI_CAPSULE_HEADER                            *CapsuleHeader,
   IN EFI_STATUS                                    CapsuleStatus,
   IN UINTN                                         PayloadIndex,
@@ -1170,7 +1170,7 @@ RecordFmpCapsuleStatus (
 EFI_STATUS
 ProcessFmpCapsuleImage (
   IN EFI_CAPSULE_HEADER  *CapsuleHeader,
-  IN CHAR16              *CapFileName,  OPTIONAL
+  IN CHAR16              *CapFileName   OPTIONAL,
   OUT BOOLEAN            *ResetRequired OPTIONAL
   )
 {
@@ -1506,7 +1506,7 @@ EFI_STATUS
 EFIAPI
 ProcessThisCapsuleImage (
   IN EFI_CAPSULE_HEADER  *CapsuleHeader,
-  IN CHAR16              *CapFileName,  OPTIONAL
+  IN CHAR16              *CapFileName   OPTIONAL,
   OUT BOOLEAN            *ResetRequired OPTIONAL
   )
 {

MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleProcessLib.c

@@ -148,7 +148,7 @@ EFI_STATUS
 EFIAPI
 ProcessThisCapsuleImage (
   IN EFI_CAPSULE_HEADER  *CapsuleHeader,
-  IN CHAR16              *CapFileName,  OPTIONAL
+  IN CHAR16              *CapFileName   OPTIONAL,
   OUT BOOLEAN            *ResetRequired OPTIONAL
   );
 

MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c

@@ -231,7 +231,7 @@ RecordFmpCapsuleStatusVariable (
   IN EFI_STATUS                                    CapsuleStatus,
   IN UINTN                                         PayloadIndex,
   IN EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER  *ImageHeader,
-  IN EFI_DEVICE_PATH_PROTOCOL                      *FmpDevicePath, OPTIONAL
+  IN EFI_DEVICE_PATH_PROTOCOL                      *FmpDevicePath  OPTIONAL,
   IN CHAR16                                        *CapFileName    OPTIONAL
   )
 {

MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLibNull.c

@@ -50,7 +50,7 @@ RecordFmpCapsuleStatusVariable (
   IN EFI_STATUS                                    CapsuleStatus,
   IN UINTN                                         PayloadIndex,
   IN EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER  *ImageHeader,
-  IN EFI_DEVICE_PATH_PROTOCOL                      *FmpDevicePath, OPTIONAL
+  IN EFI_DEVICE_PATH_PROTOCOL                      *FmpDevicePath  OPTIONAL,
   IN CHAR16                                        *CapFileName    OPTIONAL
   )
 {

MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c

@@ -932,11 +932,11 @@ GetDeviceInfoFromHandleAndUpdateLength (
 **/
 EFI_STATUS
 InsertFpdtRecord (
-  IN CONST VOID                        *CallerIdentifier,  OPTIONAL
-  IN CONST VOID                        *Guid,    OPTIONAL
-  IN CONST CHAR8                       *String,  OPTIONAL
+  IN CONST VOID                        *CallerIdentifier   OPTIONAL,
+  IN CONST VOID                        *Guid     OPTIONAL,
+  IN CONST CHAR8                       *String   OPTIONAL,
   IN       UINT64                      Ticker,
-  IN       UINT64                      Address,  OPTIONAL
+  IN       UINT64                      Address   OPTIONAL,
   IN       UINT16                      PerfId,
   IN       PERF_MEASUREMENT_ATTRIBUTE  Attribute
   )
@@ -1513,10 +1513,10 @@ EFI_STATUS
 EFIAPI
 CreatePerformanceMeasurement (
   IN CONST VOID                        *CallerIdentifier,
-  IN CONST VOID                        *Guid,   OPTIONAL
-  IN CONST CHAR8                       *String, OPTIONAL
+  IN CONST VOID                        *Guid    OPTIONAL,
+  IN CONST CHAR8                       *String  OPTIONAL,
   IN       UINT64                      TimeStamp,
-  IN       UINT64                      Address,  OPTIONAL
+  IN       UINT64                      Address   OPTIONAL,
   IN       UINT32                      Identifier,
   IN       PERF_MEASUREMENT_ATTRIBUTE  Attribute
   )
@@ -1565,9 +1565,9 @@ CreatePerformanceMeasurement (
 RETURN_STATUS
 EFIAPI
 StartPerformanceMeasurementEx (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp,
   IN UINT32       Identifier
   )
@@ -1614,9 +1614,9 @@ StartPerformanceMeasurementEx (
 RETURN_STATUS
 EFIAPI
 EndPerformanceMeasurementEx (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp,
   IN UINT32       Identifier
   )
@@ -1719,9 +1719,9 @@ GetPerformanceMeasurementEx (
 RETURN_STATUS
 EFIAPI
 StartPerformanceMeasurement (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp
   )
 {
@@ -1755,9 +1755,9 @@ StartPerformanceMeasurement (
 RETURN_STATUS
 EFIAPI
 EndPerformanceMeasurement (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp
   )
 {
@@ -1859,9 +1859,9 @@ RETURN_STATUS
 EFIAPI
 LogPerformanceMeasurement (
   IN CONST VOID   *CallerIdentifier,
-  IN CONST VOID   *Guid,    OPTIONAL
-  IN CONST CHAR8  *String,  OPTIONAL
-  IN UINT64       Address, OPTIONAL
+  IN CONST VOID   *Guid     OPTIONAL,
+  IN CONST CHAR8  *String   OPTIONAL,
+  IN UINT64       Address  OPTIONAL,
   IN UINT32       Identifier
   )
 {

MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLibInternal.h

@@ -66,11 +66,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 EFI_STATUS
 EFIAPI
 CreatePerformanceMeasurement(
-  IN CONST VOID                        *CallerIdentifier, OPTIONAL
-  IN CONST VOID                        *Guid,     OPTIONAL
-  IN CONST CHAR8                       *String,   OPTIONAL
-  IN       UINT64                      TimeStamp, OPTIONAL
-  IN       UINT64                      Address,   OPTIONAL
+  IN CONST VOID                        *CallerIdentifier  OPTIONAL,
+  IN CONST VOID                        *Guid      OPTIONAL,
+  IN CONST CHAR8                       *String    OPTIONAL,
+  IN       UINT64                      TimeStamp  OPTIONAL,
+  IN       UINT64                      Address    OPTIONAL,
   IN       UINT32                      Identifier,
   IN       PERF_MEASUREMENT_ATTRIBUTE  Attribute
   );

MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.c

@@ -112,7 +112,7 @@ EFIAPI
 Crc32GuidedSectionHandler (
   IN CONST  VOID    *InputSection,
   OUT       VOID    **OutputBuffer,
-  IN        VOID    *ScratchBuffer,        OPTIONAL
+  IN        VOID    *ScratchBuffer         OPTIONAL,
   OUT       UINT32  *AuthenticationStatus
   )
 {
@@ -227,4 +227,3 @@ DxeCrc32GuidedSectionExtractLibConstructor (
           Crc32GuidedSectionHandler
           );
 }
-

MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.c

@@ -77,11 +77,10 @@ EFI_STATUS
 EFIAPI
 ChooseFile (
   IN  EFI_DEVICE_PATH_PROTOCOL  *RootDirectory,
-  IN  CHAR16                    *FileType,  OPTIONAL
-  IN  CHOOSE_HANDLER            ChooseHandler,  OPTIONAL
+  IN  CHAR16                    *FileType   OPTIONAL,
+  IN  CHOOSE_HANDLER            ChooseHandler   OPTIONAL,
   OUT EFI_DEVICE_PATH_PROTOCOL  **File  OPTIONAL
   )
 {
   return mProtocol->ChooseFile (RootDirectory, FileType, ChooseHandler, File);
 }
-

MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c

@@ -85,9 +85,9 @@ GetPerformanceMeasurementProtocol (
 RETURN_STATUS
 EFIAPI
 StartPerformanceMeasurementEx (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp,
   IN UINT32       Identifier
   )
@@ -144,9 +144,9 @@ StartPerformanceMeasurementEx (
 RETURN_STATUS
 EFIAPI
 EndPerformanceMeasurementEx (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp,
   IN UINT32       Identifier
   )
@@ -256,9 +256,9 @@ GetPerformanceMeasurementEx (
 RETURN_STATUS
 EFIAPI
 StartPerformanceMeasurement (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp
   )
 {
@@ -290,9 +290,9 @@ StartPerformanceMeasurement (
 RETURN_STATUS
 EFIAPI
 EndPerformanceMeasurement (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp
   )
 {
@@ -392,9 +392,9 @@ RETURN_STATUS
 EFIAPI
 LogPerformanceMeasurement (
   IN CONST VOID   *CallerIdentifier,
-  IN CONST VOID   *Guid,    OPTIONAL
-  IN CONST CHAR8  *String,  OPTIONAL
-  IN  UINT64       Address, OPTIONAL
+  IN CONST VOID   *Guid     OPTIONAL,
+  IN CONST CHAR8  *String   OPTIONAL,
+  IN  UINT64       Address  OPTIONAL,
   IN UINT32       Identifier
   )
 {

MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c

@@ -1161,7 +1161,7 @@ InternalPrintLibSPrintMarker (
   IN  UINTN        BufferSize,
   IN  UINTN        Flags,
   IN  CONST CHAR8  *Format,
-  IN  VA_LIST      VaListMarker,   OPTIONAL
+  IN  VA_LIST      VaListMarker    OPTIONAL,
   IN  BASE_LIST    BaseListMarker  OPTIONAL
   );
 
@@ -1321,7 +1321,7 @@ InternalPrintLibSPrintMarker (
   IN  UINTN        BufferSize,
   IN  UINTN        Flags,
   IN  CONST CHAR8  *Format,
-  IN  VA_LIST      VaListMarker,   OPTIONAL
+  IN  VA_LIST      VaListMarker    OPTIONAL,
   IN  BASE_LIST    BaseListMarker  OPTIONAL
   )
 {

MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.c

@@ -473,7 +473,7 @@ EFIAPI
 ExecuteSecurity2Handlers (
   IN  UINT32                           AuthenticationOperation,
   IN  UINT32                           AuthenticationStatus,
-  IN  CONST EFI_DEVICE_PATH_PROTOCOL   *File, OPTIONAL
+  IN  CONST EFI_DEVICE_PATH_PROTOCOL   *File  OPTIONAL,
   IN  VOID                             *FileBuffer,
   IN  UINTN                            FileSize,
   IN  BOOLEAN                          BootPolicy

MdeModulePkg/Library/FileExplorerLib/FileExplorer.c

@@ -1473,8 +1473,8 @@ EFI_STATUS
 EFIAPI
 ChooseFile (
   IN  EFI_DEVICE_PATH_PROTOCOL  *RootDirectory,
-  IN  CHAR16                    *FileType,  OPTIONAL
-  IN  CHOOSE_HANDLER            ChooseHandler,  OPTIONAL
+  IN  CHAR16                    *FileType   OPTIONAL,
+  IN  CHOOSE_HANDLER            ChooseHandler   OPTIONAL,
   OUT EFI_DEVICE_PATH_PROTOCOL  **File  OPTIONAL
   )
 {
@@ -1648,4 +1648,3 @@ FileExplorerLibDestructor (
 
   return EFI_SUCCESS;
 }
-

MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c

@@ -649,7 +649,7 @@ RETURN_STATUS
 EFIAPI
 FrameBufferBlt (
   IN     FRAME_BUFFER_CONFIGURE                *Configure,
-  IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL         *BltBuffer, OPTIONAL
+  IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL         *BltBuffer  OPTIONAL,
   IN     EFI_GRAPHICS_OUTPUT_BLT_OPERATION     BltOperation,
   IN     UINTN                                 SourceX,
   IN     UINTN                                 SourceY,

MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.c

@@ -111,7 +111,7 @@ RETURN_STATUS
 EFIAPI
 RestoreLockBox (
   IN  GUID                        *Guid,
-  IN  VOID                        *Buffer, OPTIONAL
+  IN  VOID                        *Buffer  OPTIONAL,
   IN  OUT UINTN                   *Length  OPTIONAL
   )
 {

MdeModulePkg/Library/LzmaCustomDecompressLib/F86GuidedSectionExtraction.c

@@ -130,7 +130,7 @@ EFIAPI
 LzmaArchGuidedSectionExtraction (
   IN CONST  VOID    *InputSection,
   OUT       VOID    **OutputBuffer,
-  OUT       VOID    *ScratchBuffer,        OPTIONAL
+  OUT       VOID    *ScratchBuffer         OPTIONAL,
   OUT       UINT32  *AuthenticationStatus
   )
 {
@@ -210,4 +210,3 @@ LzmaArchDecompressLibConstructor (
           LzmaArchGuidedSectionExtraction
           );
 }
-

MdeModulePkg/Library/LzmaCustomDecompressLib/GuidedSectionExtraction.c

@@ -128,7 +128,7 @@ EFIAPI
 LzmaGuidedSectionExtraction (
   IN CONST  VOID    *InputSection,
   OUT       VOID    **OutputBuffer,
-  OUT       VOID    *ScratchBuffer,        OPTIONAL
+  OUT       VOID    *ScratchBuffer         OPTIONAL,
   OUT       UINT32  *AuthenticationStatus
   )
 {
@@ -193,4 +193,3 @@ LzmaDecompressLibConstructor (
           LzmaGuidedSectionExtraction
           );
 }
-

MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c

@@ -47,10 +47,9 @@ OemHookStatusCodeReport (
   IN EFI_STATUS_CODE_TYPE     CodeType,
   IN EFI_STATUS_CODE_VALUE    Value,
   IN UINT32                   Instance,
-  IN EFI_GUID                 *CallerId, OPTIONAL
+  IN EFI_GUID                 *CallerId  OPTIONAL,
   IN EFI_STATUS_CODE_DATA     *Data      OPTIONAL
   )
 {
   return EFI_SUCCESS;
 }
-

MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.c

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

MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c

@@ -300,11 +300,11 @@ CopyStringIntoPerfRecordAndUpdateLength (
 **/
 EFI_STATUS
 InsertFpdtRecord (
-  IN CONST VOID                        *CallerIdentifier,  OPTIONAL
-  IN CONST VOID                        *Guid,    OPTIONAL
-  IN CONST CHAR8                       *String,  OPTIONAL
+  IN CONST VOID                        *CallerIdentifier   OPTIONAL,
+  IN CONST VOID                        *Guid     OPTIONAL,
+  IN CONST CHAR8                       *String   OPTIONAL,
   IN       UINT64                      Ticker,
-  IN       UINT64                      Address,  OPTIONAL
+  IN       UINT64                      Address   OPTIONAL,
   IN       UINT16                      PerfId,
   IN       PERF_MEASUREMENT_ATTRIBUTE  Attribute
   )
@@ -536,9 +536,9 @@ InsertFpdtRecord (
 RETURN_STATUS
 EFIAPI
 StartPerformanceMeasurementEx (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp,
   IN UINT32       Identifier
   )
@@ -582,9 +582,9 @@ StartPerformanceMeasurementEx (
 RETURN_STATUS
 EFIAPI
 EndPerformanceMeasurementEx (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp,
   IN UINT32       Identifier
   )
@@ -686,9 +686,9 @@ GetPerformanceMeasurementEx (
 RETURN_STATUS
 EFIAPI
 StartPerformanceMeasurement (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp
   )
 {
@@ -718,9 +718,9 @@ StartPerformanceMeasurement (
 RETURN_STATUS
 EFIAPI
 EndPerformanceMeasurement (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp
   )
 {
@@ -822,9 +822,9 @@ RETURN_STATUS
 EFIAPI
 LogPerformanceMeasurement (
   IN CONST VOID   *CallerIdentifier,
-  IN CONST VOID   *Guid,    OPTIONAL
-  IN CONST CHAR8  *String,  OPTIONAL
-  IN UINT64       Address, OPTIONAL
+  IN CONST VOID   *Guid     OPTIONAL,
+  IN CONST CHAR8  *String   OPTIONAL,
+  IN UINT64       Address  OPTIONAL,
   IN UINT32       Identifier
   )
 {

MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c

@@ -503,11 +503,11 @@ CopyStringIntoPerfRecordAndUpdateLength (
 **/
 EFI_STATUS
 InsertFpdtRecord (
-  IN CONST VOID                        *CallerIdentifier,  OPTIONAL
-  IN CONST VOID                        *Guid,    OPTIONAL
-  IN CONST CHAR8                       *String,  OPTIONAL
+  IN CONST VOID                        *CallerIdentifier   OPTIONAL,
+  IN CONST VOID                        *Guid     OPTIONAL,
+  IN CONST CHAR8                       *String   OPTIONAL,
   IN       UINT64                      Ticker,
-  IN       UINT64                      Address,  OPTIONAL
+  IN       UINT64                      Address   OPTIONAL,
   IN       UINT16                      PerfId,
   IN       PERF_MEASUREMENT_ATTRIBUTE  Attribute
   )
@@ -1026,11 +1026,11 @@ SmmCorePerformanceLibConstructor (
 EFI_STATUS
 EFIAPI
 CreatePerformanceMeasurement(
-  IN CONST VOID                        *CallerIdentifier, OPTIONAL
-  IN CONST VOID                        *Guid,     OPTIONAL
-  IN CONST CHAR8                       *String,   OPTIONAL
-  IN       UINT64                      TimeStamp, OPTIONAL
-  IN       UINT64                      Address,   OPTIONAL
+  IN CONST VOID                        *CallerIdentifier  OPTIONAL,
+  IN CONST VOID                        *Guid      OPTIONAL,
+  IN CONST CHAR8                       *String    OPTIONAL,
+  IN       UINT64                      TimeStamp  OPTIONAL,
+  IN       UINT64                      Address    OPTIONAL,
   IN       UINT32                      Identifier,
   IN       PERF_MEASUREMENT_ATTRIBUTE  Attribute
   )
@@ -1073,9 +1073,9 @@ CreatePerformanceMeasurement(
 RETURN_STATUS
 EFIAPI
 StartPerformanceMeasurementEx (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp,
   IN UINT32       Identifier
   )
@@ -1122,9 +1122,9 @@ StartPerformanceMeasurementEx (
 RETURN_STATUS
 EFIAPI
 EndPerformanceMeasurementEx (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp,
   IN UINT32       Identifier
   )
@@ -1226,9 +1226,9 @@ GetPerformanceMeasurementEx (
 RETURN_STATUS
 EFIAPI
 StartPerformanceMeasurement (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp
   )
 {
@@ -1262,9 +1262,9 @@ StartPerformanceMeasurement (
 RETURN_STATUS
 EFIAPI
 EndPerformanceMeasurement (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp
   )
 {
@@ -1366,9 +1366,9 @@ RETURN_STATUS
 EFIAPI
 LogPerformanceMeasurement (
   IN CONST VOID   *CallerIdentifier,
-  IN CONST VOID   *Guid,    OPTIONAL
-  IN CONST CHAR8  *String,  OPTIONAL
-  IN UINT64       Address, OPTIONAL
+  IN CONST VOID   *Guid     OPTIONAL,
+  IN CONST CHAR8  *String   OPTIONAL,
+  IN UINT64       Address  OPTIONAL,
   IN UINT32       Identifier
   )
 {
@@ -1401,4 +1401,3 @@ LogPerformanceMeasurementEnabled (
   }
   return FALSE;
 }
-

MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLibInternal.h

@@ -64,11 +64,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 EFI_STATUS
 EFIAPI
 CreatePerformanceMeasurement(
-  IN CONST VOID                        *CallerIdentifier, OPTIONAL
-  IN CONST VOID                        *Guid,     OPTIONAL
-  IN CONST CHAR8                       *String,   OPTIONAL
-  IN       UINT64                      TimeStamp, OPTIONAL
-  IN       UINT64                      Address,   OPTIONAL
+  IN CONST VOID                        *CallerIdentifier  OPTIONAL,
+  IN CONST VOID                        *Guid      OPTIONAL,
+  IN CONST CHAR8                       *String    OPTIONAL,
+  IN       UINT64                      TimeStamp  OPTIONAL,
+  IN       UINT64                      Address    OPTIONAL,
   IN       UINT32                      Identifier,
   IN       PERF_MEASUREMENT_ATTRIBUTE  Attribute
   );

MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c

@@ -395,7 +395,7 @@ RETURN_STATUS
 EFIAPI
 RestoreLockBox (
   IN  GUID                        *Guid,
-  IN  VOID                        *Buffer, OPTIONAL
+  IN  VOID                        *Buffer  OPTIONAL,
   IN  OUT UINTN                   *Length  OPTIONAL
   )
 {
@@ -535,4 +535,3 @@ RestoreAllLockBoxInPlace (
   //
   return Status;
 }
-

MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxMmLib.c

@@ -725,7 +725,7 @@ RETURN_STATUS
 EFIAPI
 RestoreLockBox (
   IN  GUID                        *Guid,
-  IN  VOID                        *Buffer, OPTIONAL
+  IN  VOID                        *Buffer  OPTIONAL,
   IN  OUT UINTN                   *Length  OPTIONAL
   )
 {
@@ -858,4 +858,3 @@ RestoreAllLockBoxInPlace (
   DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreAllLockBoxInPlace - Exit (%r)\n", EFI_SUCCESS));
   return EFI_SUCCESS;
 }
-

MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c

@@ -238,7 +238,7 @@ InternalGetSmmLockBoxContext (
 EFI_STATUS
 InternalRestoreLockBoxFromSmram (
   IN  GUID                        *Guid,
-  IN  VOID                        *Buffer, OPTIONAL
+  IN  VOID                        *Buffer  OPTIONAL,
   IN  OUT UINTN                   *Length  OPTIONAL
   )
 {
@@ -517,7 +517,7 @@ RETURN_STATUS
 EFIAPI
 RestoreLockBox (
   IN  GUID                        *Guid,
-  IN  VOID                        *Buffer, OPTIONAL
+  IN  VOID                        *Buffer  OPTIONAL,
   IN  OUT UINTN                   *Length  OPTIONAL
   )
 {
@@ -739,4 +739,3 @@ RestoreAllLockBoxInPlace (
   //
   return Status;
 }
-

MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.c

@@ -105,9 +105,9 @@ GetPerformanceMeasurementProtocol (
 RETURN_STATUS
 EFIAPI
 StartPerformanceMeasurementEx (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp,
   IN UINT32       Identifier
   )
@@ -164,9 +164,9 @@ StartPerformanceMeasurementEx (
 RETURN_STATUS
 EFIAPI
 EndPerformanceMeasurementEx (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp,
   IN UINT32       Identifier
   )
@@ -275,9 +275,9 @@ GetPerformanceMeasurementEx (
 RETURN_STATUS
 EFIAPI
 StartPerformanceMeasurement (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp
   )
 {
@@ -309,9 +309,9 @@ StartPerformanceMeasurement (
 RETURN_STATUS
 EFIAPI
 EndPerformanceMeasurement (
-  IN CONST VOID   *Handle,  OPTIONAL
-  IN CONST CHAR8  *Token,   OPTIONAL
-  IN CONST CHAR8  *Module,  OPTIONAL
+  IN CONST VOID   *Handle   OPTIONAL,
+  IN CONST CHAR8  *Token    OPTIONAL,
+  IN CONST CHAR8  *Module   OPTIONAL,
   IN UINT64       TimeStamp
   )
 {
@@ -411,9 +411,9 @@ RETURN_STATUS
 EFIAPI
 LogPerformanceMeasurement (
   IN CONST VOID   *CallerIdentifier,
-  IN CONST VOID   *Guid,    OPTIONAL
-  IN CONST CHAR8  *String,  OPTIONAL
-  IN UINT64       Address, OPTIONAL
+  IN CONST VOID   *Guid     OPTIONAL,
+  IN CONST CHAR8  *String   OPTIONAL,
+  IN UINT64       Address  OPTIONAL,
   IN UINT32       Identifier
   )
 {

MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLib.h

@@ -29,7 +29,7 @@
 EFI_STATUS
 InternalLocateProtocol (
   IN  EFI_GUID  *Protocol,
-  IN  VOID      *Registration, OPTIONAL
+  IN  VOID      *Registration  OPTIONAL,
   OUT VOID      **Interface
   );
 

MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLibStandaloneMm.c

@@ -30,7 +30,7 @@
 EFI_STATUS
 InternalLocateProtocol (
   IN  EFI_GUID  *Protocol,
-  IN  VOID      *Registration, OPTIONAL
+  IN  VOID      *Registration  OPTIONAL,
   OUT VOID      **Interface
   )
 {

MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLibTraditional.c

@@ -30,7 +30,7 @@
 EFI_STATUS
 InternalLocateProtocol (
   IN  EFI_GUID  *Protocol,
-  IN  VOID      *Registration, OPTIONAL
+  IN  VOID      *Registration  OPTIONAL,
   OUT VOID      **Interface
   )
 {

MdeModulePkg/Library/SmmSmiHandlerProfileLib/MmSmiHandlerProfileLib.c

@@ -40,7 +40,7 @@ SmiHandlerProfileRegisterHandler (
   IN EFI_GUID                       *HandlerGuid,
   IN EFI_SMM_HANDLER_ENTRY_POINT2   Handler,
   IN PHYSICAL_ADDRESS               CallerAddress,
-  IN VOID                           *Context, OPTIONAL
+  IN VOID                           *Context  OPTIONAL,
   IN UINTN                          ContextSize OPTIONAL
   )
 {
@@ -72,7 +72,7 @@ EFIAPI
 SmiHandlerProfileUnregisterHandler (
   IN EFI_GUID                       *HandlerGuid,
   IN EFI_SMM_HANDLER_ENTRY_POINT2   Handler,
-  IN VOID                           *Context, OPTIONAL
+  IN VOID                           *Context  OPTIONAL,
   IN UINTN                          ContextSize OPTIONAL
   )
 {
@@ -99,4 +99,3 @@ MmSmiHandlerProfileLibInitialization (
            );
   return EFI_SUCCESS;
 }
-

MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c

@@ -192,7 +192,7 @@ BmGetSingleControllerHealthStatus (
   IN OUT EFI_BOOT_MANAGER_DRIVER_HEALTH_INFO **DriverHealthInfo,
   IN OUT UINTN                               *Count,
   IN  EFI_HANDLE                             DriverHealthHandle,
-  IN  EFI_HANDLE                             ControllerHandle,  OPTIONAL
+  IN  EFI_HANDLE                             ControllerHandle   OPTIONAL,
   IN  EFI_HANDLE                             ChildHandle        OPTIONAL
   )
 {

MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c

@@ -942,7 +942,7 @@ EfiBootManagerStartHotkeyService (
 EFI_STATUS
 EFIAPI
 EfiBootManagerAddKeyOptionVariable (
-  OUT EFI_BOOT_MANAGER_KEY_OPTION *AddedOption,   OPTIONAL
+  OUT EFI_BOOT_MANAGER_KEY_OPTION *AddedOption    OPTIONAL,
   IN UINT16                       BootOptionNumber,
   IN UINT32                       Modifier,
   ...
@@ -1053,7 +1053,7 @@ EfiBootManagerAddKeyOptionVariable (
 EFI_STATUS
 EFIAPI
 EfiBootManagerDeleteKeyOptionVariable (
-  IN EFI_BOOT_MANAGER_KEY_OPTION *DeletedOption, OPTIONAL
+  IN EFI_BOOT_MANAGER_KEY_OPTION *DeletedOption  OPTIONAL,
   IN UINT32                      Modifier,
   ...
   )

MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c

@@ -476,7 +476,7 @@ EfiBootManagerInitializeLoadOption (
   IN  UINT32                            Attributes,
   IN  CHAR16                            *Description,
   IN  EFI_DEVICE_PATH_PROTOCOL          *FilePath,
-  IN  UINT8                             *OptionalData,   OPTIONAL
+  IN  UINT8                             *OptionalData    OPTIONAL,
   IN  UINT32                            OptionalDataSize
   )
 {

MdeModulePkg/Library/UefiHiiLib/HiiLib.c

@@ -603,8 +603,8 @@ InternalHiiBlockToConfig (
 EFI_STRING
 EFIAPI
 InternalHiiBrowserCallback (
-  IN CONST EFI_GUID    *VariableGuid,  OPTIONAL
-  IN CONST CHAR16      *VariableName,  OPTIONAL
+  IN CONST EFI_GUID    *VariableGuid   OPTIONAL,
+  IN CONST CHAR16      *VariableName   OPTIONAL,
   IN CONST EFI_STRING  SetResultsData  OPTIONAL
   )
 {
@@ -713,8 +713,8 @@ InternalHiiBrowserCallback (
 EFI_STRING
 EFIAPI
 HiiConstructConfigHdr (
-  IN CONST EFI_GUID  *Guid,  OPTIONAL
-  IN CONST CHAR16    *Name,  OPTIONAL
+  IN CONST EFI_GUID  *Guid   OPTIONAL,
+  IN CONST CHAR16    *Name   OPTIONAL,
   IN EFI_HANDLE      DriverHandle
   )
 {
@@ -2241,7 +2241,7 @@ GetElementsFromRequest (
 BOOLEAN
 EFIAPI
 InternalHiiIfrValueAction (
-  IN CONST EFI_STRING Request,  OPTIONAL
+  IN CONST EFI_STRING Request   OPTIONAL,
   IN UINT16           DefaultId,
   IN UINT8            ActionType
   )
@@ -2636,7 +2636,7 @@ HiiValidateSettings (
 BOOLEAN
 EFIAPI
 HiiSetToDefaults (
-  IN CONST EFI_STRING Request,  OPTIONAL
+  IN CONST EFI_STRING Request   OPTIONAL,
   IN UINT16        DefaultId
   )
 {
@@ -2736,7 +2736,7 @@ BOOLEAN
 EFIAPI
 HiiIsConfigHdrMatch (
   IN CONST EFI_STRING  ConfigHdr,
-  IN CONST EFI_GUID    *Guid,     OPTIONAL
+  IN CONST EFI_GUID    *Guid      OPTIONAL,
   IN CONST CHAR16      *Name      OPTIONAL
   )
 {
@@ -2794,8 +2794,8 @@ HiiIsConfigHdrMatch (
 BOOLEAN
 EFIAPI
 HiiGetBrowserData (
-  IN CONST EFI_GUID  *VariableGuid,  OPTIONAL
-  IN CONST CHAR16    *VariableName,  OPTIONAL
+  IN CONST EFI_GUID  *VariableGuid   OPTIONAL,
+  IN CONST CHAR16    *VariableName   OPTIONAL,
   IN UINTN           BufferSize,
   OUT UINT8          *Buffer
   )
@@ -2876,8 +2876,8 @@ HiiGetBrowserData (
 BOOLEAN
 EFIAPI
 HiiSetBrowserData (
-  IN CONST EFI_GUID  *VariableGuid, OPTIONAL
-  IN CONST CHAR16    *VariableName, OPTIONAL
+  IN CONST EFI_GUID  *VariableGuid  OPTIONAL,
+  IN CONST CHAR16    *VariableName  OPTIONAL,
   IN UINTN           BufferSize,
   IN CONST UINT8     *Buffer,
   IN CONST CHAR16    *RequestElement  OPTIONAL
@@ -3330,7 +3330,7 @@ EFIAPI
 HiiCreateGuidOpCode (
   IN VOID            *OpCodeHandle,
   IN CONST EFI_GUID  *Guid,
-  IN CONST VOID      *GuidOpCode,    OPTIONAL
+  IN CONST VOID      *GuidOpCode     OPTIONAL,
   IN UINTN           OpCodeSize
   )
 {
@@ -3528,7 +3528,7 @@ HiiCreateGotoExOpCode (
   IN UINT8            QuestionFlags,
   IN EFI_QUESTION_ID  QuestionId,
   IN EFI_QUESTION_ID  RefQuestionId,
-  IN EFI_GUID         *RefFormSetId,    OPTIONAL
+  IN EFI_GUID         *RefFormSetId     OPTIONAL,
   IN EFI_STRING_ID    RefDevicePath
   )
 {
@@ -3997,8 +3997,8 @@ EFIAPI
 HiiCreateDateOpCode (
   IN VOID             *OpCodeHandle,
   IN EFI_QUESTION_ID  QuestionId,
-  IN EFI_VARSTORE_ID  VarStoreId,   OPTIONAL
-  IN UINT16           VarOffset,    OPTIONAL
+  IN EFI_VARSTORE_ID  VarStoreId    OPTIONAL,
+  IN UINT16           VarOffset     OPTIONAL,
   IN EFI_STRING_ID    Prompt,
   IN EFI_STRING_ID    Help,
   IN UINT8            QuestionFlags,
@@ -4062,8 +4062,8 @@ EFIAPI
 HiiCreateTimeOpCode (
   IN VOID             *OpCodeHandle,
   IN EFI_QUESTION_ID  QuestionId,
-  IN EFI_VARSTORE_ID  VarStoreId,   OPTIONAL
-  IN UINT16           VarOffset,    OPTIONAL
+  IN EFI_VARSTORE_ID  VarStoreId    OPTIONAL,
+  IN UINT16           VarOffset     OPTIONAL,
   IN EFI_STRING_ID    Prompt,
   IN EFI_STRING_ID    Help,
   IN UINT8            QuestionFlags,
@@ -4117,11 +4117,11 @@ HiiCreateTimeOpCode (
 EFI_STATUS
 EFIAPI
 InternalHiiUpdateFormPackageData (
-  IN  EFI_GUID               *FormSetGuid, OPTIONAL
+  IN  EFI_GUID               *FormSetGuid  OPTIONAL,
   IN  EFI_FORM_ID            FormId,
   IN  EFI_HII_PACKAGE_HEADER *Package,
   IN  HII_LIB_OPCODE_BUFFER  *OpCodeBufferStart,
-  IN  HII_LIB_OPCODE_BUFFER  *OpCodeBufferEnd,    OPTIONAL
+  IN  HII_LIB_OPCODE_BUFFER  *OpCodeBufferEnd     OPTIONAL,
   OUT EFI_HII_PACKAGE_HEADER *TempPackage
   )
 {
@@ -4321,7 +4321,7 @@ EFI_STATUS
 EFIAPI
 HiiUpdateForm (
   IN EFI_HII_HANDLE  HiiHandle,
-  IN EFI_GUID        *FormSetGuid,        OPTIONAL
+  IN EFI_GUID        *FormSetGuid         OPTIONAL,
   IN EFI_FORM_ID     FormId,
   IN VOID            *StartOpCodeHandle,
   IN VOID            *EndOpCodeHandle     OPTIONAL

MdeModulePkg/Library/UefiHiiLib/HiiString.c

@@ -52,7 +52,7 @@ EFI_STRING_ID
 EFIAPI
 HiiSetString (
   IN EFI_HII_HANDLE    HiiHandle,
-  IN EFI_STRING_ID     StringId,            OPTIONAL
+  IN EFI_STRING_ID     StringId             OPTIONAL,
   IN CONST EFI_STRING  String,
   IN CONST CHAR8       *SupportedLanguages  OPTIONAL
   )
@@ -392,4 +392,3 @@ Error:
   //
   return String;
 }
-

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,

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,

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,

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
   );
 

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
   )
 {

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
   )

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
   )
 {

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

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;
 }
-

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;
 }
-
-

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

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
   )

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;
 }
-
-

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);
   }
 }
-

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
-

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
   )
 {

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

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
-

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
   )
 {

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
   );
 

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

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
   )
 {

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
   );
 

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;
 }
-

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
   );
 

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
   )

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
   )