OvmfPkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the OvmfPkg package

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

3 files changed, 292 insertions, 212 deletions

diff --git a/OvmfPkg/VirtioPciDeviceDxe/VirtioPciDevice.c b/OvmfPkg/VirtioPciDeviceDxe/VirtioPciDevice.c
index c5c8d5ebef..b4ac195b0d 100644
--- a/OvmfPkg/VirtioPciDeviceDxe/VirtioPciDevice.c
+++ b/OvmfPkg/VirtioPciDeviceDxe/VirtioPciDevice.c
@@ -20,7 +20,7 @@
 

 #include "VirtioPciDevice.h"

 

-STATIC VIRTIO_DEVICE_PROTOCOL mDeviceProtocolTemplate = {

+STATIC VIRTIO_DEVICE_PROTOCOL  mDeviceProtocolTemplate = {

   0,                                    // Revision

   0,                                    // SubSystemDeviceId

   VirtioPciGetDeviceFeatures,           // GetDeviceFeatures

@@ -67,16 +67,16 @@ STATIC VIRTIO_DEVICE_PROTOCOL mDeviceProtocolTemplate = {
 EFI_STATUS

 EFIAPI

 VirtioPciIoRead (

-  IN  VIRTIO_PCI_DEVICE         *Dev,

-  IN  UINTN                     FieldOffset,

-  IN  UINTN                     FieldSize,

-  IN  UINTN                     BufferSize,

-  OUT VOID                      *Buffer

+  IN  VIRTIO_PCI_DEVICE  *Dev,

+  IN  UINTN              FieldOffset,

+  IN  UINTN              FieldSize,

+  IN  UINTN              BufferSize,

+  OUT VOID               *Buffer

   )

 {

-  UINTN                     Count;

-  EFI_PCI_IO_PROTOCOL_WIDTH Width;

-  EFI_PCI_IO_PROTOCOL       *PciIo;

+  UINTN                      Count;

+  EFI_PCI_IO_PROTOCOL_WIDTH  Width;

+  EFI_PCI_IO_PROTOCOL        *PciIo;

 

   ASSERT (FieldSize == BufferSize);

 

@@ -105,9 +105,9 @@ VirtioPciIoRead (
       //

       Count = 2;

 

-      //

-      // fall through

-      //

+    //

+    // fall through

+    //

     case 4:

       Width = EfiPciIoWidthUint32;

       break;

@@ -150,15 +150,15 @@ VirtioPciIoRead (
 EFI_STATUS

 EFIAPI

 VirtioPciIoWrite (

-  IN  VIRTIO_PCI_DEVICE         *Dev,

-  IN UINTN                      FieldOffset,

-  IN UINTN                      FieldSize,

-  IN UINT64                     Value

+  IN  VIRTIO_PCI_DEVICE  *Dev,

+  IN UINTN               FieldOffset,

+  IN UINTN               FieldSize,

+  IN UINT64              Value

   )

 {

-  UINTN                     Count;

-  EFI_PCI_IO_PROTOCOL_WIDTH Width;

-  EFI_PCI_IO_PROTOCOL       *PciIo;

+  UINTN                      Count;

+  EFI_PCI_IO_PROTOCOL_WIDTH  Width;

+  EFI_PCI_IO_PROTOCOL        *PciIo;

 

   PciIo = Dev->PciIo;

   Count = 1;

@@ -185,9 +185,9 @@ VirtioPciIoWrite (
       //

       Count = Count * 2;

 

-      //

-      // fall through

-      //

+    //

+    // fall through

+    //

     case 4:

       Width = EfiPciIoWidthUint32;

       break;

@@ -236,14 +236,14 @@ STATIC
 EFI_STATUS

 EFIAPI

 VirtioPciDeviceBindingSupported (

-  IN EFI_DRIVER_BINDING_PROTOCOL *This,

-  IN EFI_HANDLE                  DeviceHandle,

-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath

+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,

+  IN EFI_HANDLE                   DeviceHandle,

+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath

   )

 {

-  EFI_STATUS          Status;

-  EFI_PCI_IO_PROTOCOL *PciIo;

-  PCI_TYPE00          Pci;

+  EFI_STATUS           Status;

+  EFI_PCI_IO_PROTOCOL  *PciIo;

+  PCI_TYPE00           Pci;

 

   //

   // Attempt to open the device with the PciIo set of interfaces. On success,

@@ -284,7 +284,8 @@ VirtioPciDeviceBindingSupported (
     if ((Pci.Hdr.VendorId == VIRTIO_VENDOR_ID) &&

         (Pci.Hdr.DeviceId >= 0x1000) &&

         (Pci.Hdr.DeviceId <= 0x103F) &&

-        (Pci.Hdr.RevisionID == 0x00)) {

+        (Pci.Hdr.RevisionID == 0x00))

+    {

       Status = EFI_SUCCESS;

     } else {

       Status = EFI_UNSUPPORTED;

@@ -295,8 +296,12 @@ VirtioPciDeviceBindingSupported (
   // We needed PCI IO access only transitorily, to see whether we support the

   // device or not.

   //

-  gBS->CloseProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,

-         This->DriverBindingHandle, DeviceHandle);

+  gBS->CloseProtocol (

+         DeviceHandle,

+         &gEfiPciIoProtocolGuid,

+         This->DriverBindingHandle,

+         DeviceHandle

+         );

 

   return Status;

 }

@@ -321,12 +326,12 @@ STATIC
 EFI_STATUS

 EFIAPI

 VirtioPciInit (

-  IN OUT VIRTIO_PCI_DEVICE *Device

+  IN OUT VIRTIO_PCI_DEVICE  *Device

   )

 {

-  EFI_STATUS            Status;

-  EFI_PCI_IO_PROTOCOL   *PciIo;

-  PCI_TYPE00            Pci;

+  EFI_STATUS           Status;

+  EFI_PCI_IO_PROTOCOL  *PciIo;

+  PCI_TYPE00           Pci;

 

   ASSERT (Device != NULL);

   PciIo = Device->PciIo;

@@ -334,13 +339,13 @@ VirtioPciInit (
   ASSERT (PciIo->Pci.Read != NULL);

 

   Status = PciIo->Pci.Read (

-                        PciIo,                        // (protocol, device)

-                                                      // handle

-                        EfiPciIoWidthUint32,          // access width & copy

-                                                      // mode

-                        0,                            // Offset

+                        PciIo,                          // (protocol, device)

+                                                        // handle

+                        EfiPciIoWidthUint32,            // access width & copy

+                                                        // mode

+                        0,                              // Offset

                         sizeof (Pci) / sizeof (UINT32), // Count

-                        &Pci                          // target buffer

+                        &Pci                            // target buffer

                         );

   if (EFI_ERROR (Status)) {

     return Status;

@@ -349,13 +354,16 @@ VirtioPciInit (
   //

   // Copy protocol template

   //

-  CopyMem (&Device->VirtioDevice, &mDeviceProtocolTemplate,

-      sizeof (VIRTIO_DEVICE_PROTOCOL));

+  CopyMem (

+    &Device->VirtioDevice,

+    &mDeviceProtocolTemplate,

+    sizeof (VIRTIO_DEVICE_PROTOCOL)

+    );

 

   //

   // Initialize the protocol interface attributes

   //

-  Device->VirtioDevice.Revision = VIRTIO_SPEC_REVISION (0, 9, 5);

+  Device->VirtioDevice.Revision          = VIRTIO_SPEC_REVISION (0, 9, 5);

   Device->VirtioDevice.SubSystemDeviceId = Pci.Device.SubsystemID;

 

   //

@@ -363,7 +371,7 @@ VirtioPciInit (
   //       the offset would become 24 after enabling MSI-X.

   //

   Device->DeviceSpecificConfigurationOffset =

-      VIRTIO_DEVICE_SPECIFIC_CONFIGURATION_OFFSET_PCI;

+    VIRTIO_DEVICE_SPECIFIC_CONFIGURATION_OFFSET_PCI;

 

   return EFI_SUCCESS;

 }

@@ -376,12 +384,11 @@ VirtioPciInit (
   @param[in, out]  Dev  The device to clean up.

 

 **/

-

 STATIC

 VOID

 EFIAPI

 VirtioPciUninit (

-  IN OUT VIRTIO_PCI_DEVICE *Device

+  IN OUT VIRTIO_PCI_DEVICE  *Device

   )

 {

   // Note: This function mirrors VirtioPciInit() that does not allocate any

@@ -420,22 +427,27 @@ STATIC
 EFI_STATUS

 EFIAPI

 VirtioPciDeviceBindingStart (

-  IN EFI_DRIVER_BINDING_PROTOCOL *This,

-  IN EFI_HANDLE                  DeviceHandle,

-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath

+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,

+  IN EFI_HANDLE                   DeviceHandle,

+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath

   )

 {

-  VIRTIO_PCI_DEVICE   *Device;

-  EFI_STATUS           Status;

+  VIRTIO_PCI_DEVICE  *Device;

+  EFI_STATUS         Status;

 

-  Device = (VIRTIO_PCI_DEVICE *) AllocateZeroPool (sizeof *Device);

+  Device = (VIRTIO_PCI_DEVICE *)AllocateZeroPool (sizeof *Device);

   if (Device == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

 

-  Status = gBS->OpenProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,

-                  (VOID **)&Device->PciIo, This->DriverBindingHandle,

-                  DeviceHandle, EFI_OPEN_PROTOCOL_BY_DRIVER);

+  Status = gBS->OpenProtocol (

+                  DeviceHandle,

+                  &gEfiPciIoProtocolGuid,

+                  (VOID **)&Device->PciIo,

+                  This->DriverBindingHandle,

+                  DeviceHandle,

+                  EFI_OPEN_PROTOCOL_BY_DRIVER

+                  );

   if (EFI_ERROR (Status)) {

     goto FreeVirtioPci;

   }

@@ -451,8 +463,12 @@ VirtioPciDeviceBindingStart (
   //

   // For virtio-pci we only need IO space access.

   //

-  Status = Device->PciIo->Attributes (Device->PciIo,

-      EfiPciIoAttributeOperationGet, 0, &Device->OriginalPciAttributes);

+  Status = Device->PciIo->Attributes (

+                            Device->PciIo,

+                            EfiPciIoAttributeOperationGet,

+                            0,

+                            &Device->OriginalPciAttributes

+                            );

   if (EFI_ERROR (Status)) {

     goto ClosePciIo;

   }

@@ -482,9 +498,12 @@ VirtioPciDeviceBindingStart (
   // interface.

   //

   Device->Signature = VIRTIO_PCI_DEVICE_SIGNATURE;

-  Status = gBS->InstallProtocolInterface (&DeviceHandle,

-                  &gVirtioDeviceProtocolGuid, EFI_NATIVE_INTERFACE,

-                  &Device->VirtioDevice);

+  Status            = gBS->InstallProtocolInterface (

+                             &DeviceHandle,

+                             &gVirtioDeviceProtocolGuid,

+                             EFI_NATIVE_INTERFACE,

+                             &Device->VirtioDevice

+                             );

   if (EFI_ERROR (Status)) {

     goto UninitDev;

   }

@@ -495,12 +514,20 @@ UninitDev:
   VirtioPciUninit (Device);

 

 RestorePciAttributes:

-  Device->PciIo->Attributes (Device->PciIo, EfiPciIoAttributeOperationSet,

-                Device->OriginalPciAttributes, NULL);

+  Device->PciIo->Attributes (

+                   Device->PciIo,

+                   EfiPciIoAttributeOperationSet,

+                   Device->OriginalPciAttributes,

+                   NULL

+                   );

 

 ClosePciIo:

-  gBS->CloseProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,

-         This->DriverBindingHandle, DeviceHandle);

+  gBS->CloseProtocol (

+         DeviceHandle,

+         &gEfiPciIoProtocolGuid,

+         This->DriverBindingHandle,

+         DeviceHandle

+         );

 

 FreeVirtioPci:

   FreePool (Device);

@@ -537,13 +564,13 @@ STATIC
 EFI_STATUS

 EFIAPI

 VirtioPciDeviceBindingStop (

-  IN EFI_DRIVER_BINDING_PROTOCOL *This,

-  IN EFI_HANDLE                  DeviceHandle,

-  IN UINTN                       NumberOfChildren,

-  IN EFI_HANDLE                  *ChildHandleBuffer

+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,

+  IN EFI_HANDLE                   DeviceHandle,

+  IN UINTN                        NumberOfChildren,

+  IN EFI_HANDLE                   *ChildHandleBuffer

   )

 {

-  EFI_STATUS               Status;

+  EFI_STATUS              Status;

   VIRTIO_DEVICE_PROTOCOL  *VirtioDevice;

   VIRTIO_PCI_DEVICE       *Device;

 

@@ -564,32 +591,42 @@ VirtioPciDeviceBindingStop (
   //

   // Handle Stop() requests for in-use driver instances gracefully.

   //

-  Status = gBS->UninstallProtocolInterface (DeviceHandle,

-                  &gVirtioDeviceProtocolGuid, &Device->VirtioDevice);

+  Status = gBS->UninstallProtocolInterface (

+                  DeviceHandle,

+                  &gVirtioDeviceProtocolGuid,

+                  &Device->VirtioDevice

+                  );

   if (EFI_ERROR (Status)) {

     return Status;

   }

 

   VirtioPciUninit (Device);

 

-  Device->PciIo->Attributes (Device->PciIo, EfiPciIoAttributeOperationSet,

-                Device->OriginalPciAttributes, NULL);

-

-  Status = gBS->CloseProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,

-         This->DriverBindingHandle, DeviceHandle);

+  Device->PciIo->Attributes (

+                   Device->PciIo,

+                   EfiPciIoAttributeOperationSet,

+                   Device->OriginalPciAttributes,

+                   NULL

+                   );

+

+  Status = gBS->CloseProtocol (

+                  DeviceHandle,

+                  &gEfiPciIoProtocolGuid,

+                  This->DriverBindingHandle,

+                  DeviceHandle

+                  );

 

   FreePool (Device);

 

   return Status;

 }

 

-

 //

 // The static object that groups the Supported() (ie. probe), Start() and

 // Stop() functions of the driver together. Refer to UEFI Spec 2.3.1 + Errata

 // C, 10.1 EFI Driver Binding Protocol.

 //

-STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {

+STATIC EFI_DRIVER_BINDING_PROTOCOL  gDriverBinding = {

   &VirtioPciDeviceBindingSupported,

   &VirtioPciDeviceBindingStart,

   &VirtioPciDeviceBindingStop,

@@ -599,7 +636,6 @@ STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {
   NULL  // DriverBindingHandle, ditto

 };

 

-

 //

 // The purpose of the following scaffolding (EFI_COMPONENT_NAME_PROTOCOL and

 // EFI_COMPONENT_NAME2_PROTOCOL implementation) is to format the driver's name

@@ -608,20 +644,20 @@ STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {
 // Guide for UEFI 2.3.1 v1.01, 11 UEFI Driver and Controller Names.

 //

 STATIC

-EFI_UNICODE_STRING_TABLE mDriverNameTable[] = {

+EFI_UNICODE_STRING_TABLE  mDriverNameTable[] = {

   { "eng;en", L"Virtio PCI Driver" },

-  { NULL,     NULL                   }

+  { NULL,     NULL                 }

 };

 

 STATIC

-EFI_COMPONENT_NAME_PROTOCOL gComponentName;

+EFI_COMPONENT_NAME_PROTOCOL  gComponentName;

 

 EFI_STATUS

 EFIAPI

 VirtioPciGetDriverName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,

-  IN  CHAR8                       *Language,

-  OUT CHAR16                      **DriverName

+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,

+  IN  CHAR8                        *Language,

+  OUT CHAR16                       **DriverName

   )

 {

   return LookupUnicodeString2 (

@@ -636,39 +672,38 @@ VirtioPciGetDriverName (
 EFI_STATUS

 EFIAPI

 VirtioPciGetDeviceName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,

-  IN  EFI_HANDLE                  DeviceHandle,

-  IN  EFI_HANDLE                  ChildHandle,

-  IN  CHAR8                       *Language,

-  OUT CHAR16                      **ControllerName

+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,

+  IN  EFI_HANDLE                   DeviceHandle,

+  IN  EFI_HANDLE                   ChildHandle,

+  IN  CHAR8                        *Language,

+  OUT CHAR16                       **ControllerName

   )

 {

   return EFI_UNSUPPORTED;

 }

 

 STATIC

-EFI_COMPONENT_NAME_PROTOCOL gComponentName = {

+EFI_COMPONENT_NAME_PROTOCOL  gComponentName = {

   &VirtioPciGetDriverName,

   &VirtioPciGetDeviceName,

   "eng" // SupportedLanguages, ISO 639-2 language codes

 };

 

 STATIC

-EFI_COMPONENT_NAME2_PROTOCOL gComponentName2 = {

-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)     &VirtioPciGetDriverName,

-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) &VirtioPciGetDeviceName,

+EFI_COMPONENT_NAME2_PROTOCOL  gComponentName2 = {

+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)&VirtioPciGetDriverName,

+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)&VirtioPciGetDeviceName,

   "en" // SupportedLanguages, RFC 4646 language codes

 };

 

-

 //

 // Entry point of this driver.

 //

 EFI_STATUS

 EFIAPI

 VirtioPciDeviceEntryPoint (

-  IN EFI_HANDLE       ImageHandle,

-  IN EFI_SYSTEM_TABLE *SystemTable

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

   return EfiLibInstallDriverBindingComponentName2 (

diff --git a/OvmfPkg/VirtioPciDeviceDxe/VirtioPciDevice.h b/OvmfPkg/VirtioPciDeviceDxe/VirtioPciDevice.h
index fe8514d42a..772a03c446 100644
--- a/OvmfPkg/VirtioPciDeviceDxe/VirtioPciDevice.h
+++ b/OvmfPkg/VirtioPciDeviceDxe/VirtioPciDevice.h
@@ -19,37 +19,36 @@
 

 #include <IndustryStandard/Virtio.h>

 

-#define VIRTIO_PCI_DEVICE_SIGNATURE   SIGNATURE_32 ('V', 'P', 'C', 'I')

+#define VIRTIO_PCI_DEVICE_SIGNATURE  SIGNATURE_32 ('V', 'P', 'C', 'I')

 

 typedef struct {

-  UINT32                 Signature;

-  VIRTIO_DEVICE_PROTOCOL VirtioDevice;

-  EFI_PCI_IO_PROTOCOL   *PciIo;

-  UINT64                 OriginalPciAttributes;

-  UINT32                 DeviceSpecificConfigurationOffset;

+  UINT32                    Signature;

+  VIRTIO_DEVICE_PROTOCOL    VirtioDevice;

+  EFI_PCI_IO_PROTOCOL       *PciIo;

+  UINT64                    OriginalPciAttributes;

+  UINT32                    DeviceSpecificConfigurationOffset;

 } VIRTIO_PCI_DEVICE;

 

 #define VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE(Device) \

     CR (Device, VIRTIO_PCI_DEVICE, VirtioDevice, VIRTIO_PCI_DEVICE_SIGNATURE)

 

-

 EFI_STATUS

 EFIAPI

 VirtioPciIoRead (

-  IN  VIRTIO_PCI_DEVICE         *Dev,

-  IN  UINTN                      FieldOffset,

-  IN  UINTN                      FieldSize,

-  IN  UINTN                      BufferSize,

-  OUT VOID                       *Buffer

+  IN  VIRTIO_PCI_DEVICE  *Dev,

+  IN  UINTN              FieldOffset,

+  IN  UINTN              FieldSize,

+  IN  UINTN              BufferSize,

+  OUT VOID               *Buffer

   );

 

 EFI_STATUS

 EFIAPI

 VirtioPciIoWrite (

-  IN  VIRTIO_PCI_DEVICE         *Dev,

-  IN UINTN                       FieldOffset,

-  IN UINTN                       FieldSize,

-  IN UINT64                      Value

+  IN  VIRTIO_PCI_DEVICE  *Dev,

+  IN UINTN               FieldOffset,

+  IN UINTN               FieldSize,

+  IN UINT64              Value

   );

 

 /********************************************

@@ -58,27 +57,27 @@ VirtioPciIoWrite (
 EFI_STATUS

 EFIAPI

 VirtioPciDeviceRead (

-  IN  VIRTIO_DEVICE_PROTOCOL     *This,

-  IN  UINTN                      FieldOffset,

-  IN  UINTN                      FieldSize,

-  IN  UINTN                      BufferSize,

-  OUT VOID                       *Buffer

+  IN  VIRTIO_DEVICE_PROTOCOL  *This,

+  IN  UINTN                   FieldOffset,

+  IN  UINTN                   FieldSize,

+  IN  UINTN                   BufferSize,

+  OUT VOID                    *Buffer

   );

 

 EFI_STATUS

 EFIAPI

 VirtioPciDeviceWrite (

-  IN VIRTIO_DEVICE_PROTOCOL      *This,

-  IN UINTN                       FieldOffset,

-  IN UINTN                       FieldSize,

-  IN UINT64                      Value

+  IN VIRTIO_DEVICE_PROTOCOL  *This,

+  IN UINTN                   FieldOffset,

+  IN UINTN                   FieldSize,

+  IN UINT64                  Value

   );

 

 EFI_STATUS

 EFIAPI

 VirtioPciGetDeviceFeatures (

-  IN VIRTIO_DEVICE_PROTOCOL *This,

-  OUT UINT64                *DeviceFeatures

+  IN VIRTIO_DEVICE_PROTOCOL  *This,

+  OUT UINT64                 *DeviceFeatures

   );

 

 EFI_STATUS

@@ -91,15 +90,15 @@ VirtioPciGetQueueSize (
 EFI_STATUS

 EFIAPI

 VirtioPciSetQueueAlignment (

-  IN  VIRTIO_DEVICE_PROTOCOL         *This,

-  IN  UINT32                         Alignment

+  IN  VIRTIO_DEVICE_PROTOCOL  *This,

+  IN  UINT32                  Alignment

   );

 

 EFI_STATUS

 EFIAPI

 VirtioPciSetPageSize (

-  IN  VIRTIO_DEVICE_PROTOCOL         *This,

-  IN  UINT32                         PageSize

+  IN  VIRTIO_DEVICE_PROTOCOL  *This,

+  IN  UINT32                  PageSize

   );

 

 EFI_STATUS

@@ -113,7 +112,7 @@ EFI_STATUS
 EFIAPI

 VirtioPciSetGuestFeatures (

   IN VIRTIO_DEVICE_PROTOCOL  *This,

-  IN UINT64                   Features

+  IN UINT64                  Features

   );

 

 EFI_STATUS

@@ -127,62 +126,63 @@ VirtioPciSetQueueAddress (
 EFI_STATUS

 EFIAPI

 VirtioPciSetQueueSel (

-  IN  VIRTIO_DEVICE_PROTOCOL         *This,

-  IN  UINT16                         Sel

+  IN  VIRTIO_DEVICE_PROTOCOL  *This,

+  IN  UINT16                  Sel

   );

 

 EFI_STATUS

 EFIAPI

 VirtioPciSetQueueNotify (

-  IN  VIRTIO_DEVICE_PROTOCOL         *This,

-  IN  UINT16                         Index

+  IN  VIRTIO_DEVICE_PROTOCOL  *This,

+  IN  UINT16                  Index

   );

 

 EFI_STATUS

 EFIAPI

 VirtioPciSetQueueSize (

-  IN  VIRTIO_DEVICE_PROTOCOL         *This,

-  IN  UINT16                         Size

+  IN  VIRTIO_DEVICE_PROTOCOL  *This,

+  IN  UINT16                  Size

   );

 

 EFI_STATUS

 EFIAPI

 VirtioPciSetDeviceStatus (

-  IN  VIRTIO_DEVICE_PROTOCOL         *This,

-  IN  UINT8                          DeviceStatus

+  IN  VIRTIO_DEVICE_PROTOCOL  *This,

+  IN  UINT8                   DeviceStatus

   );

 

 EFI_STATUS

 EFIAPI

 VirtioPciAllocateSharedPages (

-  IN  VIRTIO_DEVICE_PROTOCOL        *This,

-  IN  UINTN                         NumPages,

-  OUT VOID                          **HostAddress

+  IN  VIRTIO_DEVICE_PROTOCOL  *This,

+  IN  UINTN                   NumPages,

+  OUT VOID                    **HostAddress

   );

 

 VOID

 EFIAPI

 VirtioPciFreeSharedPages (

-  IN  VIRTIO_DEVICE_PROTOCOL        *This,

-  IN  UINTN                         NumPages,

-  IN  VOID                          *HostAddress

+  IN  VIRTIO_DEVICE_PROTOCOL  *This,

+  IN  UINTN                   NumPages,

+  IN  VOID                    *HostAddress

   );

 

 EFI_STATUS

 EFIAPI

 VirtioPciMapSharedBuffer (

-  IN      VIRTIO_DEVICE_PROTOCOL        *This,

-  IN      VIRTIO_MAP_OPERATION          Operation,

-  IN      VOID                          *HostAddress,

-  IN OUT  UINTN                         *NumberOfBytes,

-  OUT     EFI_PHYSICAL_ADDRESS          *DeviceAddress,

-  OUT     VOID                          **Mapping

+  IN      VIRTIO_DEVICE_PROTOCOL  *This,

+  IN      VIRTIO_MAP_OPERATION    Operation,

+  IN      VOID                    *HostAddress,

+  IN OUT  UINTN                   *NumberOfBytes,

+  OUT     EFI_PHYSICAL_ADDRESS    *DeviceAddress,

+  OUT     VOID                    **Mapping

   );

 

 EFI_STATUS

 EFIAPI

 VirtioPciUnmapSharedBuffer (

-  IN  VIRTIO_DEVICE_PROTOCOL        *This,

-  IN  VOID                          *Mapping

+  IN  VIRTIO_DEVICE_PROTOCOL  *This,

+  IN  VOID                    *Mapping

   );

+

 #endif // _VIRTIO_PCI_DEVICE_DXE_H_

diff --git a/OvmfPkg/VirtioPciDeviceDxe/VirtioPciFunctions.c b/OvmfPkg/VirtioPciDeviceDxe/VirtioPciFunctions.c
index 46a9354be0..92165de226 100644
--- a/OvmfPkg/VirtioPciDeviceDxe/VirtioPciFunctions.c
+++ b/OvmfPkg/VirtioPciDeviceDxe/VirtioPciFunctions.c
@@ -42,20 +42,24 @@
 EFI_STATUS

 EFIAPI

 VirtioPciDeviceRead (

-  IN  VIRTIO_DEVICE_PROTOCOL    *This,

-  IN  UINTN                     FieldOffset,

-  IN  UINTN                     FieldSize,

-  IN  UINTN                     BufferSize,

-  OUT VOID                      *Buffer

+  IN  VIRTIO_DEVICE_PROTOCOL  *This,

+  IN  UINTN                   FieldOffset,

+  IN  UINTN                   FieldSize,

+  IN  UINTN                   BufferSize,

+  OUT VOID                    *Buffer

   )

 {

-  VIRTIO_PCI_DEVICE         *Dev;

+  VIRTIO_PCI_DEVICE  *Dev;

 

   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);

 

-  return VirtioPciIoRead (Dev,

-      Dev->DeviceSpecificConfigurationOffset + FieldOffset,

-      FieldSize, BufferSize, Buffer);

+  return VirtioPciIoRead (

+           Dev,

+           Dev->DeviceSpecificConfigurationOffset + FieldOffset,

+           FieldSize,

+           BufferSize,

+           Buffer

+           );

 }

 

 /**

@@ -78,30 +82,34 @@ VirtioPciDeviceRead (
 EFI_STATUS

 EFIAPI

 VirtioPciDeviceWrite (

-  IN VIRTIO_DEVICE_PROTOCOL *This,

-  IN UINTN                  FieldOffset,

-  IN UINTN                  FieldSize,

-  IN UINT64                 Value

+  IN VIRTIO_DEVICE_PROTOCOL  *This,

+  IN UINTN                   FieldOffset,

+  IN UINTN                   FieldSize,

+  IN UINT64                  Value

   )

 {

-  VIRTIO_PCI_DEVICE         *Dev;

+  VIRTIO_PCI_DEVICE  *Dev;

 

   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);

 

-  return VirtioPciIoWrite (Dev,

-      Dev->DeviceSpecificConfigurationOffset + FieldOffset, FieldSize, Value);

+  return VirtioPciIoWrite (

+           Dev,

+           Dev->DeviceSpecificConfigurationOffset + FieldOffset,

+           FieldSize,

+           Value

+           );

 }

 

 EFI_STATUS

 EFIAPI

 VirtioPciGetDeviceFeatures (

-  IN VIRTIO_DEVICE_PROTOCOL *This,

-  OUT UINT64                *DeviceFeatures

+  IN VIRTIO_DEVICE_PROTOCOL  *This,

+  OUT UINT64                 *DeviceFeatures

   )

 {

-  VIRTIO_PCI_DEVICE         *Dev;

-  EFI_STATUS                Status;

-  UINT32                    Features32;

+  VIRTIO_PCI_DEVICE  *Dev;

+  EFI_STATUS         Status;

+  UINT32             Features32;

 

   if (DeviceFeatures == NULL) {

     return EFI_INVALID_PARAMETER;

@@ -109,11 +117,17 @@ VirtioPciGetDeviceFeatures (
 

   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);

 

-  Status = VirtioPciIoRead (Dev, VIRTIO_PCI_OFFSET_DEVICE_FEATURES,

-             sizeof (UINT32), sizeof (UINT32), &Features32);

+  Status = VirtioPciIoRead (

+             Dev,

+             VIRTIO_PCI_OFFSET_DEVICE_FEATURES,

+             sizeof (UINT32),

+             sizeof (UINT32),

+             &Features32

+             );

   if (!EFI_ERROR (Status)) {

     *DeviceFeatures = Features32;

   }

+

   return Status;

 }

 

@@ -124,7 +138,7 @@ VirtioPciGetQueueSize (
   OUT UINT16                  *QueueNumMax

   )

 {

-  VIRTIO_PCI_DEVICE         *Dev;

+  VIRTIO_PCI_DEVICE  *Dev;

 

   if (QueueNumMax == NULL) {

     return EFI_INVALID_PARAMETER;

@@ -132,8 +146,13 @@ VirtioPciGetQueueSize (
 

   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);

 

-  return VirtioPciIoRead (Dev, VIRTIO_PCI_OFFSET_QUEUE_SIZE, sizeof (UINT16),

-      sizeof (UINT16), QueueNumMax);

+  return VirtioPciIoRead (

+           Dev,

+           VIRTIO_PCI_OFFSET_QUEUE_SIZE,

+           sizeof (UINT16),

+           sizeof (UINT16),

+           QueueNumMax

+           );

 }

 

 EFI_STATUS

@@ -143,7 +162,7 @@ VirtioPciGetDeviceStatus (
   OUT UINT8                   *DeviceStatus

   )

 {

-  VIRTIO_PCI_DEVICE         *Dev;

+  VIRTIO_PCI_DEVICE  *Dev;

 

   if (DeviceStatus == NULL) {

     return EFI_INVALID_PARAMETER;

@@ -151,26 +170,36 @@ VirtioPciGetDeviceStatus (
 

   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);

 

-  return VirtioPciIoRead (Dev, VIRTIO_PCI_OFFSET_QUEUE_DEVICE_STATUS,

-      sizeof (UINT8), sizeof (UINT8), DeviceStatus);

+  return VirtioPciIoRead (

+           Dev,

+           VIRTIO_PCI_OFFSET_QUEUE_DEVICE_STATUS,

+           sizeof (UINT8),

+           sizeof (UINT8),

+           DeviceStatus

+           );

 }

 

 EFI_STATUS

 EFIAPI

 VirtioPciSetGuestFeatures (

   IN VIRTIO_DEVICE_PROTOCOL  *This,

-  IN UINT64                   Features

+  IN UINT64                  Features

   )

 {

-  VIRTIO_PCI_DEVICE *Dev;

+  VIRTIO_PCI_DEVICE  *Dev;

 

   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);

 

   if (Features > MAX_UINT32) {

     return EFI_UNSUPPORTED;

   }

-  return VirtioPciIoWrite (Dev, VIRTIO_PCI_OFFSET_GUEST_FEATURES,

-      sizeof (UINT32), Features);

+

+  return VirtioPciIoWrite (

+           Dev,

+           VIRTIO_PCI_OFFSET_GUEST_FEATURES,

+           sizeof (UINT32),

+           Features

+           );

 }

 

 EFI_STATUS

@@ -181,35 +210,43 @@ VirtioPciSetQueueAddress (
   IN UINT64                  RingBaseShift

   )

 {

-  VIRTIO_PCI_DEVICE *Dev;

+  VIRTIO_PCI_DEVICE  *Dev;

 

   ASSERT (RingBaseShift == 0);

 

   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);

 

-  return VirtioPciIoWrite (Dev, VIRTIO_PCI_OFFSET_QUEUE_ADDRESS, sizeof (UINT32),

-      (UINT32)((UINTN)Ring->Base >> EFI_PAGE_SHIFT));

+  return VirtioPciIoWrite (

+           Dev,

+           VIRTIO_PCI_OFFSET_QUEUE_ADDRESS,

+           sizeof (UINT32),

+           (UINT32)((UINTN)Ring->Base >> EFI_PAGE_SHIFT)

+           );

 }

 

 EFI_STATUS

 EFIAPI

 VirtioPciSetQueueSel (

-  IN  VIRTIO_DEVICE_PROTOCOL    *This,

-  IN  UINT16                    Sel

+  IN  VIRTIO_DEVICE_PROTOCOL  *This,

+  IN  UINT16                  Sel

   )

 {

-  VIRTIO_PCI_DEVICE *Dev;

+  VIRTIO_PCI_DEVICE  *Dev;

 

   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);

 

-  return VirtioPciIoWrite (Dev, VIRTIO_PCI_OFFSET_QUEUE_SELECT, sizeof (UINT16),

-      Sel);

+  return VirtioPciIoWrite (

+           Dev,

+           VIRTIO_PCI_OFFSET_QUEUE_SELECT,

+           sizeof (UINT16),

+           Sel

+           );

 }

 

 EFI_STATUS

 EFIAPI

 VirtioPciSetQueueAlignment (

-  IN  VIRTIO_DEVICE_PROTOCOL *This,

+  IN  VIRTIO_DEVICE_PROTOCOL  *This,

   IN  UINT32                  Alignment

   )

 {

@@ -219,7 +256,7 @@ VirtioPciSetQueueAlignment (
 EFI_STATUS

 EFIAPI

 VirtioPciSetPageSize (

-  IN  VIRTIO_DEVICE_PROTOCOL *This,

+  IN  VIRTIO_DEVICE_PROTOCOL  *This,

   IN  UINT32                  PageSize

   )

 {

@@ -229,23 +266,27 @@ VirtioPciSetPageSize (
 EFI_STATUS

 EFIAPI

 VirtioPciSetQueueNotify (

-  IN  VIRTIO_DEVICE_PROTOCOL *This,

-  IN  UINT16                 Index

+  IN  VIRTIO_DEVICE_PROTOCOL  *This,

+  IN  UINT16                  Index

   )

 {

-  VIRTIO_PCI_DEVICE *Dev;

+  VIRTIO_PCI_DEVICE  *Dev;

 

   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);

 

-  return VirtioPciIoWrite (Dev, VIRTIO_PCI_OFFSET_QUEUE_NOTIFY, sizeof (UINT16),

-      Index);

+  return VirtioPciIoWrite (

+           Dev,

+           VIRTIO_PCI_OFFSET_QUEUE_NOTIFY,

+           sizeof (UINT16),

+           Index

+           );

 }

 

 EFI_STATUS

 EFIAPI

 VirtioPciSetQueueSize (

-  IN  VIRTIO_DEVICE_PROTOCOL *This,

-  IN  UINT16                 Size

+  IN  VIRTIO_DEVICE_PROTOCOL  *This,

+  IN  UINT16                  Size

   )

 {

   //

@@ -258,16 +299,20 @@ VirtioPciSetQueueSize (
 EFI_STATUS

 EFIAPI

 VirtioPciSetDeviceStatus (

-  IN  VIRTIO_DEVICE_PROTOCOL *This,

-  IN  UINT8                  DeviceStatus

+  IN  VIRTIO_DEVICE_PROTOCOL  *This,

+  IN  UINT8                   DeviceStatus

   )

 {

-  VIRTIO_PCI_DEVICE *Dev;

+  VIRTIO_PCI_DEVICE  *Dev;

 

   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);

 

-  return VirtioPciIoWrite (Dev, VIRTIO_PCI_OFFSET_QUEUE_DEVICE_STATUS,

-      sizeof (UINT8), DeviceStatus);

+  return VirtioPciIoWrite (

+           Dev,

+           VIRTIO_PCI_OFFSET_QUEUE_DEVICE_STATUS,

+           sizeof (UINT8),

+           DeviceStatus

+           );

 }

 

 EFI_STATUS

@@ -278,7 +323,7 @@ VirtioPciAllocateSharedPages (
   OUT VOID                    **HostAddress

   )

 {

-  VOID        *Buffer;

+  VOID  *Buffer;

 

   Buffer = AllocatePages (NumPages);

   if (Buffer == NULL) {

@@ -311,8 +356,8 @@ VirtioPciMapSharedBuffer (
   OUT     VOID                    **Mapping

   )

 {

-  *DeviceAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) HostAddress;

-  *Mapping = NULL;

+  *DeviceAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)HostAddress;

+  *Mapping       = NULL;

 

   return EFI_SUCCESS;

 }

@@ -320,8 +365,8 @@ VirtioPciMapSharedBuffer (
 EFI_STATUS

 EFIAPI

 VirtioPciUnmapSharedBuffer (

-  IN VIRTIO_DEVICE_PROTOCOL    *This,

-  IN VOID                      *Mapping

+  IN VIRTIO_DEVICE_PROTOCOL  *This,

+  IN VOID                    *Mapping

   )

 {

   return EFI_SUCCESS;