]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
MdeModulePkg: Apply uncrustify changes
[mirror_edk2.git] / MdeModulePkg / Bus / Pci / NvmExpressDxe / NvmExpressBlockIo.c
index c63a6537ac53c64ad6a2133224f886ff46ec8574..b33c9034125584600893f43029e2e63170f6e265 100644 (file)
 **/\r
 EFI_STATUS\r
 ReadSectors (\r
-  IN NVME_DEVICE_PRIVATE_DATA           *Device,\r
-  IN UINT64                             Buffer,\r
-  IN UINT64                             Lba,\r
-  IN UINT32                             Blocks\r
+  IN NVME_DEVICE_PRIVATE_DATA  *Device,\r
+  IN UINT64                    Buffer,\r
+  IN UINT64                    Lba,\r
+  IN UINT32                    Blocks\r
   )\r
 {\r
-  NVME_CONTROLLER_PRIVATE_DATA             *Private;\r
-  UINT32                                   Bytes;\r
-  EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET CommandPacket;\r
-  EFI_NVM_EXPRESS_COMMAND                  Command;\r
-  EFI_NVM_EXPRESS_COMPLETION               Completion;\r
-  EFI_STATUS                               Status;\r
-  UINT32                                   BlockSize;\r
-\r
-  Private    = Device->Controller;\r
-  BlockSize  = Device->Media.BlockSize;\r
-  Bytes      = Blocks * BlockSize;\r
-\r
-  ZeroMem (&CommandPacket, sizeof(EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
-  ZeroMem (&Command, sizeof(EFI_NVM_EXPRESS_COMMAND));\r
-  ZeroMem (&Completion, sizeof(EFI_NVM_EXPRESS_COMPLETION));\r
+  NVME_CONTROLLER_PRIVATE_DATA              *Private;\r
+  UINT32                                    Bytes;\r
+  EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET  CommandPacket;\r
+  EFI_NVM_EXPRESS_COMMAND                   Command;\r
+  EFI_NVM_EXPRESS_COMPLETION                Completion;\r
+  EFI_STATUS                                Status;\r
+  UINT32                                    BlockSize;\r
+\r
+  Private   = Device->Controller;\r
+  BlockSize = Device->Media.BlockSize;\r
+  Bytes     = Blocks * BlockSize;\r
+\r
+  ZeroMem (&CommandPacket, sizeof (EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
+  ZeroMem (&Command, sizeof (EFI_NVM_EXPRESS_COMMAND));\r
+  ZeroMem (&Completion, sizeof (EFI_NVM_EXPRESS_COMPLETION));\r
 \r
   CommandPacket.NvmeCmd        = &Command;\r
   CommandPacket.NvmeCompletion = &Completion;\r
@@ -57,7 +57,7 @@ ReadSectors (
   CommandPacket.QueueType      = NVME_IO_QUEUE;\r
 \r
   CommandPacket.NvmeCmd->Cdw10 = (UINT32)Lba;\r
-  CommandPacket.NvmeCmd->Cdw11 = (UINT32)RShiftU64(Lba, 32);\r
+  CommandPacket.NvmeCmd->Cdw11 = (UINT32)RShiftU64 (Lba, 32);\r
   CommandPacket.NvmeCmd->Cdw12 = (Blocks - 1) & 0xFFFF;\r
 \r
   CommandPacket.NvmeCmd->Flags = CDW10_VALID | CDW11_VALID | CDW12_VALID;\r
@@ -86,41 +86,41 @@ ReadSectors (
 **/\r
 EFI_STATUS\r
 WriteSectors (\r
-  IN NVME_DEVICE_PRIVATE_DATA      *Device,\r
-  IN UINT64                        Buffer,\r
-  IN UINT64                        Lba,\r
-  IN UINT32                        Blocks\r
+  IN NVME_DEVICE_PRIVATE_DATA  *Device,\r
+  IN UINT64                    Buffer,\r
+  IN UINT64                    Lba,\r
+  IN UINT32                    Blocks\r
   )\r
 {\r
-  NVME_CONTROLLER_PRIVATE_DATA             *Private;\r
-  EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET CommandPacket;\r
-  EFI_NVM_EXPRESS_COMMAND                  Command;\r
-  EFI_NVM_EXPRESS_COMPLETION               Completion;\r
-  EFI_STATUS                               Status;\r
-  UINT32                                   Bytes;\r
-  UINT32                                   BlockSize;\r
-\r
-  Private    = Device->Controller;\r
-  BlockSize  = Device->Media.BlockSize;\r
-  Bytes      = Blocks * BlockSize;\r
-\r
-  ZeroMem (&CommandPacket, sizeof(EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
-  ZeroMem (&Command, sizeof(EFI_NVM_EXPRESS_COMMAND));\r
-  ZeroMem (&Completion, sizeof(EFI_NVM_EXPRESS_COMPLETION));\r
+  NVME_CONTROLLER_PRIVATE_DATA              *Private;\r
+  EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET  CommandPacket;\r
+  EFI_NVM_EXPRESS_COMMAND                   Command;\r
+  EFI_NVM_EXPRESS_COMPLETION                Completion;\r
+  EFI_STATUS                                Status;\r
+  UINT32                                    Bytes;\r
+  UINT32                                    BlockSize;\r
+\r
+  Private   = Device->Controller;\r
+  BlockSize = Device->Media.BlockSize;\r
+  Bytes     = Blocks * BlockSize;\r
+\r
+  ZeroMem (&CommandPacket, sizeof (EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
+  ZeroMem (&Command, sizeof (EFI_NVM_EXPRESS_COMMAND));\r
+  ZeroMem (&Completion, sizeof (EFI_NVM_EXPRESS_COMPLETION));\r
 \r
   CommandPacket.NvmeCmd        = &Command;\r
   CommandPacket.NvmeCompletion = &Completion;\r
 \r
   CommandPacket.NvmeCmd->Cdw0.Opcode = NVME_IO_WRITE_OPC;\r
-  CommandPacket.NvmeCmd->Nsid  = Device->NamespaceId;\r
-  CommandPacket.TransferBuffer = (VOID *)(UINTN)Buffer;\r
+  CommandPacket.NvmeCmd->Nsid        = Device->NamespaceId;\r
+  CommandPacket.TransferBuffer       = (VOID *)(UINTN)Buffer;\r
 \r
   CommandPacket.TransferLength = Bytes;\r
   CommandPacket.CommandTimeout = NVME_GENERIC_TIMEOUT;\r
   CommandPacket.QueueType      = NVME_IO_QUEUE;\r
 \r
   CommandPacket.NvmeCmd->Cdw10 = (UINT32)Lba;\r
-  CommandPacket.NvmeCmd->Cdw11 = (UINT32)RShiftU64(Lba, 32);\r
+  CommandPacket.NvmeCmd->Cdw11 = (UINT32)RShiftU64 (Lba, 32);\r
   //\r
   // Set Force Unit Access bit (bit 30) to use write-through behaviour\r
   //\r
@@ -155,19 +155,19 @@ WriteSectors (
 **/\r
 EFI_STATUS\r
 NvmeRead (\r
-  IN     NVME_DEVICE_PRIVATE_DATA       *Device,\r
-     OUT VOID                           *Buffer,\r
-  IN     UINT64                         Lba,\r
-  IN     UINTN                          Blocks\r
+  IN     NVME_DEVICE_PRIVATE_DATA  *Device,\r
+  OUT VOID                         *Buffer,\r
+  IN     UINT64                    Lba,\r
+  IN     UINTN                     Blocks\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  UINT32                           BlockSize;\r
-  NVME_CONTROLLER_PRIVATE_DATA     *Private;\r
-  UINT32                           MaxTransferBlocks;\r
-  UINTN                            OrginalBlocks;\r
-  BOOLEAN                          IsEmpty;\r
-  EFI_TPL                          OldTpl;\r
+  EFI_STATUS                    Status;\r
+  UINT32                        BlockSize;\r
+  NVME_CONTROLLER_PRIVATE_DATA  *Private;\r
+  UINT32                        MaxTransferBlocks;\r
+  UINTN                         OrginalBlocks;\r
+  BOOLEAN                       IsEmpty;\r
+  EFI_TPL                       OldTpl;\r
 \r
   //\r
   // Wait for the device's asynchronous I/O queue to become empty.\r
@@ -207,14 +207,22 @@ NvmeRead (
       Blocks = 0;\r
     }\r
 \r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       break;\r
     }\r
   }\r
 \r
-  DEBUG ((DEBUG_BLKIO, "%a: Lba = 0x%08Lx, Original = 0x%08Lx, "\r
-    "Remaining = 0x%08Lx, BlockSize = 0x%x, Status = %r\n", __FUNCTION__, Lba,\r
-    (UINT64)OrginalBlocks, (UINT64)Blocks, BlockSize, Status));\r
+  DEBUG ((\r
+    DEBUG_BLKIO,\r
+    "%a: Lba = 0x%08Lx, Original = 0x%08Lx, "\r
+    "Remaining = 0x%08Lx, BlockSize = 0x%x, Status = %r\n",\r
+    __FUNCTION__,\r
+    Lba,\r
+    (UINT64)OrginalBlocks,\r
+    (UINT64)Blocks,\r
+    BlockSize,\r
+    Status\r
+    ));\r
 \r
   return Status;\r
 }\r
@@ -233,19 +241,19 @@ NvmeRead (
 **/\r
 EFI_STATUS\r
 NvmeWrite (\r
-  IN NVME_DEVICE_PRIVATE_DATA           *Device,\r
-  IN VOID                               *Buffer,\r
-  IN UINT64                             Lba,\r
-  IN UINTN                              Blocks\r
+  IN NVME_DEVICE_PRIVATE_DATA  *Device,\r
+  IN VOID                      *Buffer,\r
+  IN UINT64                    Lba,\r
+  IN UINTN                     Blocks\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  UINT32                           BlockSize;\r
-  NVME_CONTROLLER_PRIVATE_DATA     *Private;\r
-  UINT32                           MaxTransferBlocks;\r
-  UINTN                            OrginalBlocks;\r
-  BOOLEAN                          IsEmpty;\r
-  EFI_TPL                          OldTpl;\r
+  EFI_STATUS                    Status;\r
+  UINT32                        BlockSize;\r
+  NVME_CONTROLLER_PRIVATE_DATA  *Private;\r
+  UINT32                        MaxTransferBlocks;\r
+  UINTN                         OrginalBlocks;\r
+  BOOLEAN                       IsEmpty;\r
+  EFI_TPL                       OldTpl;\r
 \r
   //\r
   // Wait for the device's asynchronous I/O queue to become empty.\r
@@ -285,14 +293,22 @@ NvmeWrite (
       Blocks = 0;\r
     }\r
 \r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       break;\r
     }\r
   }\r
 \r
-  DEBUG ((DEBUG_BLKIO, "%a: Lba = 0x%08Lx, Original = 0x%08Lx, "\r
-    "Remaining = 0x%08Lx, BlockSize = 0x%x, Status = %r\n", __FUNCTION__, Lba,\r
-    (UINT64)OrginalBlocks, (UINT64)Blocks, BlockSize, Status));\r
+  DEBUG ((\r
+    DEBUG_BLKIO,\r
+    "%a: Lba = 0x%08Lx, Original = 0x%08Lx, "\r
+    "Remaining = 0x%08Lx, BlockSize = 0x%x, Status = %r\n",\r
+    __FUNCTION__,\r
+    Lba,\r
+    (UINT64)OrginalBlocks,\r
+    (UINT64)Blocks,\r
+    BlockSize,\r
+    Status\r
+    ));\r
 \r
   return Status;\r
 }\r
@@ -308,28 +324,28 @@ NvmeWrite (
 **/\r
 EFI_STATUS\r
 NvmeFlush (\r
-  IN NVME_DEVICE_PRIVATE_DATA      *Device\r
+  IN NVME_DEVICE_PRIVATE_DATA  *Device\r
   )\r
 {\r
-  NVME_CONTROLLER_PRIVATE_DATA             *Private;\r
-  EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET CommandPacket;\r
-  EFI_NVM_EXPRESS_COMMAND                  Command;\r
-  EFI_NVM_EXPRESS_COMPLETION               Completion;\r
-  EFI_STATUS                               Status;\r
+  NVME_CONTROLLER_PRIVATE_DATA              *Private;\r
+  EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET  CommandPacket;\r
+  EFI_NVM_EXPRESS_COMMAND                   Command;\r
+  EFI_NVM_EXPRESS_COMPLETION                Completion;\r
+  EFI_STATUS                                Status;\r
 \r
   Private = Device->Controller;\r
 \r
-  ZeroMem (&CommandPacket, sizeof(EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
-  ZeroMem (&Command, sizeof(EFI_NVM_EXPRESS_COMMAND));\r
-  ZeroMem (&Completion, sizeof(EFI_NVM_EXPRESS_COMPLETION));\r
+  ZeroMem (&CommandPacket, sizeof (EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
+  ZeroMem (&Command, sizeof (EFI_NVM_EXPRESS_COMMAND));\r
+  ZeroMem (&Completion, sizeof (EFI_NVM_EXPRESS_COMPLETION));\r
 \r
   CommandPacket.NvmeCmd        = &Command;\r
   CommandPacket.NvmeCompletion = &Completion;\r
 \r
   CommandPacket.NvmeCmd->Cdw0.Opcode = NVME_IO_FLUSH_OPC;\r
-  CommandPacket.NvmeCmd->Nsid  = Device->NamespaceId;\r
-  CommandPacket.CommandTimeout = NVME_GENERIC_TIMEOUT;\r
-  CommandPacket.QueueType      = NVME_IO_QUEUE;\r
+  CommandPacket.NvmeCmd->Nsid        = Device->NamespaceId;\r
+  CommandPacket.CommandTimeout       = NVME_GENERIC_TIMEOUT;\r
+  CommandPacket.QueueType            = NVME_IO_QUEUE;\r
 \r
   Status = Private->Passthru.PassThru (\r
                                &Private->Passthru,\r
@@ -352,19 +368,19 @@ NvmeFlush (
 VOID\r
 EFIAPI\r
 AsyncIoCallback (\r
-  IN EFI_EVENT                Event,\r
-  IN VOID                     *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  NVME_BLKIO2_SUBTASK         *Subtask;\r
-  NVME_BLKIO2_REQUEST         *Request;\r
-  NVME_CQ                     *Completion;\r
-  EFI_BLOCK_IO2_TOKEN         *Token;\r
+  NVME_BLKIO2_SUBTASK  *Subtask;\r
+  NVME_BLKIO2_REQUEST  *Request;\r
+  NVME_CQ              *Completion;\r
+  EFI_BLOCK_IO2_TOKEN  *Token;\r
 \r
   gBS->CloseEvent (Event);\r
 \r
-  Subtask    = (NVME_BLKIO2_SUBTASK *) Context;\r
-  Completion = (NVME_CQ *) Subtask->CommandPacket->NvmeCompletion;\r
+  Subtask    = (NVME_BLKIO2_SUBTASK *)Context;\r
+  Completion = (NVME_CQ *)Subtask->CommandPacket->NvmeCompletion;\r
   Request    = Subtask->BlockIo2Request;\r
   Token      = Request->Token;\r
 \r
@@ -379,9 +395,9 @@ AsyncIoCallback (
       //\r
       // Dump completion entry status for debugging.\r
       //\r
-      DEBUG_CODE_BEGIN();\r
-        NvmeDumpStatus (Completion);\r
-      DEBUG_CODE_END();\r
+      DEBUG_CODE_BEGIN ();\r
+      NvmeDumpStatus (Completion);\r
+      DEBUG_CODE_END ();\r
     }\r
   }\r
 \r
@@ -422,23 +438,23 @@ AsyncIoCallback (
 **/\r
 EFI_STATUS\r
 AsyncReadSectors (\r
-  IN NVME_DEVICE_PRIVATE_DATA           *Device,\r
-  IN NVME_BLKIO2_REQUEST                *Request,\r
-  IN UINT64                             Buffer,\r
-  IN UINT64                             Lba,\r
-  IN UINT32                             Blocks,\r
-  IN BOOLEAN                            IsLast\r
+  IN NVME_DEVICE_PRIVATE_DATA  *Device,\r
+  IN NVME_BLKIO2_REQUEST       *Request,\r
+  IN UINT64                    Buffer,\r
+  IN UINT64                    Lba,\r
+  IN UINT32                    Blocks,\r
+  IN BOOLEAN                   IsLast\r
   )\r
 {\r
-  NVME_CONTROLLER_PRIVATE_DATA             *Private;\r
-  UINT32                                   Bytes;\r
-  NVME_BLKIO2_SUBTASK                      *Subtask;\r
-  EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET *CommandPacket;\r
-  EFI_NVM_EXPRESS_COMMAND                  *Command;\r
-  EFI_NVM_EXPRESS_COMPLETION               *Completion;\r
-  EFI_STATUS                               Status;\r
-  UINT32                                   BlockSize;\r
-  EFI_TPL                                  OldTpl;\r
+  NVME_CONTROLLER_PRIVATE_DATA              *Private;\r
+  UINT32                                    Bytes;\r
+  NVME_BLKIO2_SUBTASK                       *Subtask;\r
+  EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET  *CommandPacket;\r
+  EFI_NVM_EXPRESS_COMMAND                   *Command;\r
+  EFI_NVM_EXPRESS_COMPLETION                *Completion;\r
+  EFI_STATUS                                Status;\r
+  UINT32                                    BlockSize;\r
+  EFI_TPL                                   OldTpl;\r
 \r
   Private       = Device->Controller;\r
   BlockSize     = Device->Media.BlockSize;\r
@@ -488,7 +504,7 @@ AsyncReadSectors (
                   Subtask,\r
                   &Subtask->Event\r
                   );\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     goto ErrorExit;\r
   }\r
 \r
@@ -504,7 +520,7 @@ AsyncReadSectors (
   CommandPacket->QueueType      = NVME_IO_QUEUE;\r
 \r
   CommandPacket->NvmeCmd->Cdw10 = (UINT32)Lba;\r
-  CommandPacket->NvmeCmd->Cdw11 = (UINT32)RShiftU64(Lba, 32);\r
+  CommandPacket->NvmeCmd->Cdw11 = (UINT32)RShiftU64 (Lba, 32);\r
   CommandPacket->NvmeCmd->Cdw12 = (Blocks - 1) & 0xFFFF;\r
 \r
   CommandPacket->NvmeCmd->Flags = CDW10_VALID | CDW11_VALID | CDW12_VALID;\r
@@ -561,23 +577,23 @@ ErrorExit:
 **/\r
 EFI_STATUS\r
 AsyncWriteSectors (\r
-  IN NVME_DEVICE_PRIVATE_DATA           *Device,\r
-  IN NVME_BLKIO2_REQUEST                *Request,\r
-  IN UINT64                             Buffer,\r
-  IN UINT64                             Lba,\r
-  IN UINT32                             Blocks,\r
-  IN BOOLEAN                            IsLast\r
+  IN NVME_DEVICE_PRIVATE_DATA  *Device,\r
+  IN NVME_BLKIO2_REQUEST       *Request,\r
+  IN UINT64                    Buffer,\r
+  IN UINT64                    Lba,\r
+  IN UINT32                    Blocks,\r
+  IN BOOLEAN                   IsLast\r
   )\r
 {\r
-  NVME_CONTROLLER_PRIVATE_DATA             *Private;\r
-  UINT32                                   Bytes;\r
-  NVME_BLKIO2_SUBTASK                      *Subtask;\r
-  EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET *CommandPacket;\r
-  EFI_NVM_EXPRESS_COMMAND                  *Command;\r
-  EFI_NVM_EXPRESS_COMPLETION               *Completion;\r
-  EFI_STATUS                               Status;\r
-  UINT32                                   BlockSize;\r
-  EFI_TPL                                  OldTpl;\r
+  NVME_CONTROLLER_PRIVATE_DATA              *Private;\r
+  UINT32                                    Bytes;\r
+  NVME_BLKIO2_SUBTASK                       *Subtask;\r
+  EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET  *CommandPacket;\r
+  EFI_NVM_EXPRESS_COMMAND                   *Command;\r
+  EFI_NVM_EXPRESS_COMPLETION                *Completion;\r
+  EFI_STATUS                                Status;\r
+  UINT32                                    BlockSize;\r
+  EFI_TPL                                   OldTpl;\r
 \r
   Private       = Device->Controller;\r
   BlockSize     = Device->Media.BlockSize;\r
@@ -627,7 +643,7 @@ AsyncWriteSectors (
                   Subtask,\r
                   &Subtask->Event\r
                   );\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     goto ErrorExit;\r
   }\r
 \r
@@ -643,7 +659,7 @@ AsyncWriteSectors (
   CommandPacket->QueueType      = NVME_IO_QUEUE;\r
 \r
   CommandPacket->NvmeCmd->Cdw10 = (UINT32)Lba;\r
-  CommandPacket->NvmeCmd->Cdw11 = (UINT32)RShiftU64(Lba, 32);\r
+  CommandPacket->NvmeCmd->Cdw11 = (UINT32)RShiftU64 (Lba, 32);\r
   //\r
   // Set Force Unit Access bit (bit 30) to use write-through behaviour\r
   //\r
@@ -701,21 +717,21 @@ ErrorExit:
 **/\r
 EFI_STATUS\r
 NvmeAsyncRead (\r
-  IN     NVME_DEVICE_PRIVATE_DATA       *Device,\r
-     OUT VOID                           *Buffer,\r
-  IN     UINT64                         Lba,\r
-  IN     UINTN                          Blocks,\r
-  IN     EFI_BLOCK_IO2_TOKEN            *Token\r
+  IN     NVME_DEVICE_PRIVATE_DATA  *Device,\r
+  OUT VOID                         *Buffer,\r
+  IN     UINT64                    Lba,\r
+  IN     UINTN                     Blocks,\r
+  IN     EFI_BLOCK_IO2_TOKEN       *Token\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  UINT32                           BlockSize;\r
-  NVME_CONTROLLER_PRIVATE_DATA     *Private;\r
-  NVME_BLKIO2_REQUEST              *BlkIo2Req;\r
-  UINT32                           MaxTransferBlocks;\r
-  UINTN                            OrginalBlocks;\r
-  BOOLEAN                          IsEmpty;\r
-  EFI_TPL                          OldTpl;\r
+  EFI_STATUS                    Status;\r
+  UINT32                        BlockSize;\r
+  NVME_CONTROLLER_PRIVATE_DATA  *Private;\r
+  NVME_BLKIO2_REQUEST           *BlkIo2Req;\r
+  UINT32                        MaxTransferBlocks;\r
+  UINTN                         OrginalBlocks;\r
+  BOOLEAN                       IsEmpty;\r
+  EFI_TPL                       OldTpl;\r
 \r
   Status        = EFI_SUCCESS;\r
   Private       = Device->Controller;\r
@@ -745,7 +761,8 @@ NvmeAsyncRead (
     if (Blocks > MaxTransferBlocks) {\r
       Status = AsyncReadSectors (\r
                  Device,\r
-                 BlkIo2Req, (UINT64)(UINTN)Buffer,\r
+                 BlkIo2Req,\r
+                 (UINT64)(UINTN)Buffer,\r
                  Lba,\r
                  MaxTransferBlocks,\r
                  FALSE\r
@@ -767,7 +784,7 @@ NvmeAsyncRead (
       Blocks = 0;\r
     }\r
 \r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       OldTpl  = gBS->RaiseTPL (TPL_NOTIFY);\r
       IsEmpty = IsListEmpty (&BlkIo2Req->SubtasksQueue) &&\r
                 (BlkIo2Req->UnsubmittedSubtaskNum == 0);\r
@@ -785,8 +802,8 @@ NvmeAsyncRead (
         // should be returned to make sure that the caller does not free\r
         // resources still using by these requests.\r
         //\r
-        Status = EFI_SUCCESS;\r
-        Token->TransactionStatus = EFI_DEVICE_ERROR;\r
+        Status                          = EFI_SUCCESS;\r
+        Token->TransactionStatus        = EFI_DEVICE_ERROR;\r
         BlkIo2Req->LastSubtaskSubmitted = TRUE;\r
       }\r
 \r
@@ -796,9 +813,17 @@ NvmeAsyncRead (
     }\r
   }\r
 \r
-  DEBUG ((DEBUG_BLKIO, "%a: Lba = 0x%08Lx, Original = 0x%08Lx, "\r
-    "Remaining = 0x%08Lx, BlockSize = 0x%x, Status = %r\n", __FUNCTION__, Lba,\r
-    (UINT64)OrginalBlocks, (UINT64)Blocks, BlockSize, Status));\r
+  DEBUG ((\r
+    DEBUG_BLKIO,\r
+    "%a: Lba = 0x%08Lx, Original = 0x%08Lx, "\r
+    "Remaining = 0x%08Lx, BlockSize = 0x%x, Status = %r\n",\r
+    __FUNCTION__,\r
+    Lba,\r
+    (UINT64)OrginalBlocks,\r
+    (UINT64)Blocks,\r
+    BlockSize,\r
+    Status\r
+    ));\r
 \r
   return Status;\r
 }\r
@@ -820,21 +845,21 @@ NvmeAsyncRead (
 **/\r
 EFI_STATUS\r
 NvmeAsyncWrite (\r
-  IN NVME_DEVICE_PRIVATE_DATA           *Device,\r
-  IN VOID                               *Buffer,\r
-  IN UINT64                             Lba,\r
-  IN UINTN                              Blocks,\r
-  IN EFI_BLOCK_IO2_TOKEN                *Token\r
+  IN NVME_DEVICE_PRIVATE_DATA  *Device,\r
+  IN VOID                      *Buffer,\r
+  IN UINT64                    Lba,\r
+  IN UINTN                     Blocks,\r
+  IN EFI_BLOCK_IO2_TOKEN       *Token\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  UINT32                           BlockSize;\r
-  NVME_CONTROLLER_PRIVATE_DATA     *Private;\r
-  NVME_BLKIO2_REQUEST              *BlkIo2Req;\r
-  UINT32                           MaxTransferBlocks;\r
-  UINTN                            OrginalBlocks;\r
-  BOOLEAN                          IsEmpty;\r
-  EFI_TPL                          OldTpl;\r
+  EFI_STATUS                    Status;\r
+  UINT32                        BlockSize;\r
+  NVME_CONTROLLER_PRIVATE_DATA  *Private;\r
+  NVME_BLKIO2_REQUEST           *BlkIo2Req;\r
+  UINT32                        MaxTransferBlocks;\r
+  UINTN                         OrginalBlocks;\r
+  BOOLEAN                       IsEmpty;\r
+  EFI_TPL                       OldTpl;\r
 \r
   Status        = EFI_SUCCESS;\r
   Private       = Device->Controller;\r
@@ -862,14 +887,14 @@ NvmeAsyncWrite (
 \r
   while (Blocks > 0) {\r
     if (Blocks > MaxTransferBlocks) {\r
-      Status  = AsyncWriteSectors (\r
-                  Device,\r
-                  BlkIo2Req,\r
-                  (UINT64)(UINTN)Buffer,\r
-                  Lba,\r
-                  MaxTransferBlocks,\r
-                  FALSE\r
-                  );\r
+      Status = AsyncWriteSectors (\r
+                 Device,\r
+                 BlkIo2Req,\r
+                 (UINT64)(UINTN)Buffer,\r
+                 Lba,\r
+                 MaxTransferBlocks,\r
+                 FALSE\r
+                 );\r
 \r
       Blocks -= MaxTransferBlocks;\r
       Buffer  = (VOID *)(UINTN)((UINT64)(UINTN)Buffer + MaxTransferBlocks * BlockSize);\r
@@ -887,7 +912,7 @@ NvmeAsyncWrite (
       Blocks = 0;\r
     }\r
 \r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       OldTpl  = gBS->RaiseTPL (TPL_NOTIFY);\r
       IsEmpty = IsListEmpty (&BlkIo2Req->SubtasksQueue) &&\r
                 (BlkIo2Req->UnsubmittedSubtaskNum == 0);\r
@@ -905,8 +930,8 @@ NvmeAsyncWrite (
         // should be returned to make sure that the caller does not free\r
         // resources still using by these requests.\r
         //\r
-        Status = EFI_SUCCESS;\r
-        Token->TransactionStatus = EFI_DEVICE_ERROR;\r
+        Status                          = EFI_SUCCESS;\r
+        Token->TransactionStatus        = EFI_DEVICE_ERROR;\r
         BlkIo2Req->LastSubtaskSubmitted = TRUE;\r
       }\r
 \r
@@ -916,9 +941,17 @@ NvmeAsyncWrite (
     }\r
   }\r
 \r
-  DEBUG ((DEBUG_BLKIO, "%a: Lba = 0x%08Lx, Original = 0x%08Lx, "\r
-    "Remaining = 0x%08Lx, BlockSize = 0x%x, Status = %r\n", __FUNCTION__, Lba,\r
-    (UINT64)OrginalBlocks, (UINT64)Blocks, BlockSize, Status));\r
+  DEBUG ((\r
+    DEBUG_BLKIO,\r
+    "%a: Lba = 0x%08Lx, Original = 0x%08Lx, "\r
+    "Remaining = 0x%08Lx, BlockSize = 0x%x, Status = %r\n",\r
+    __FUNCTION__,\r
+    Lba,\r
+    (UINT64)OrginalBlocks,\r
+    (UINT64)Blocks,\r
+    BlockSize,\r
+    Status\r
+    ));\r
 \r
   return Status;\r
 }\r
@@ -937,14 +970,14 @@ NvmeAsyncWrite (
 EFI_STATUS\r
 EFIAPI\r
 NvmeBlockIoReset (\r
-  IN  EFI_BLOCK_IO_PROTOCOL   *This,\r
-  IN  BOOLEAN                 ExtendedVerification\r
+  IN  EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN  BOOLEAN                ExtendedVerification\r
   )\r
 {\r
-  EFI_TPL                         OldTpl;\r
-  NVME_CONTROLLER_PRIVATE_DATA    *Private;\r
-  NVME_DEVICE_PRIVATE_DATA        *Device;\r
-  EFI_STATUS                      Status;\r
+  EFI_TPL                       OldTpl;\r
+  NVME_CONTROLLER_PRIVATE_DATA  *Private;\r
+  NVME_DEVICE_PRIVATE_DATA      *Device;\r
+  EFI_STATUS                    Status;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -953,13 +986,13 @@ NvmeBlockIoReset (
   //\r
   // For Nvm Express subsystem, reset block device means reset controller.\r
   //\r
-  OldTpl  = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
-  Device  = NVME_DEVICE_PRIVATE_DATA_FROM_BLOCK_IO (This);\r
+  Device = NVME_DEVICE_PRIVATE_DATA_FROM_BLOCK_IO (This);\r
 \r
   Private = Device->Controller;\r
 \r
-  Status  = NvmeControllerInit (Private);\r
+  Status = NvmeControllerInit (Private);\r
 \r
   if (EFI_ERROR (Status)) {\r
     Status = EFI_DEVICE_ERROR;\r
@@ -992,20 +1025,20 @@ NvmeBlockIoReset (
 EFI_STATUS\r
 EFIAPI\r
 NvmeBlockIoReadBlocks (\r
-  IN  EFI_BLOCK_IO_PROTOCOL   *This,\r
-  IN  UINT32                  MediaId,\r
-  IN  EFI_LBA                 Lba,\r
-  IN  UINTN                   BufferSize,\r
-  OUT VOID                    *Buffer\r
+  IN  EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN  UINT32                 MediaId,\r
+  IN  EFI_LBA                Lba,\r
+  IN  UINTN                  BufferSize,\r
+  OUT VOID                   *Buffer\r
   )\r
 {\r
-  NVME_DEVICE_PRIVATE_DATA          *Device;\r
-  EFI_STATUS                        Status;\r
-  EFI_BLOCK_IO_MEDIA                *Media;\r
-  UINTN                             BlockSize;\r
-  UINTN                             NumberOfBlocks;\r
-  UINTN                             IoAlign;\r
-  EFI_TPL                           OldTpl;\r
+  NVME_DEVICE_PRIVATE_DATA  *Device;\r
+  EFI_STATUS                Status;\r
+  EFI_BLOCK_IO_MEDIA        *Media;\r
+  UINTN                     BlockSize;\r
+  UINTN                     NumberOfBlocks;\r
+  UINTN                     IoAlign;\r
+  EFI_TPL                   OldTpl;\r
 \r
   //\r
   // Check parameters.\r
@@ -1033,13 +1066,13 @@ NvmeBlockIoReadBlocks (
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
-  NumberOfBlocks  = BufferSize / BlockSize;\r
+  NumberOfBlocks = BufferSize / BlockSize;\r
   if ((Lba + NumberOfBlocks - 1) > Media->LastBlock) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   IoAlign = Media->IoAlign;\r
-  if (IoAlign > 0 && (((UINTN) Buffer & (IoAlign - 1)) != 0)) {\r
+  if ((IoAlign > 0) && (((UINTN)Buffer & (IoAlign - 1)) != 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1076,20 +1109,20 @@ NvmeBlockIoReadBlocks (
 EFI_STATUS\r
 EFIAPI\r
 NvmeBlockIoWriteBlocks (\r
-  IN  EFI_BLOCK_IO_PROTOCOL   *This,\r
-  IN  UINT32                  MediaId,\r
-  IN  EFI_LBA                 Lba,\r
-  IN  UINTN                   BufferSize,\r
-  IN  VOID                    *Buffer\r
+  IN  EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN  UINT32                 MediaId,\r
+  IN  EFI_LBA                Lba,\r
+  IN  UINTN                  BufferSize,\r
+  IN  VOID                   *Buffer\r
   )\r
 {\r
-  NVME_DEVICE_PRIVATE_DATA          *Device;\r
-  EFI_STATUS                        Status;\r
-  EFI_BLOCK_IO_MEDIA                *Media;\r
-  UINTN                             BlockSize;\r
-  UINTN                             NumberOfBlocks;\r
-  UINTN                             IoAlign;\r
-  EFI_TPL                           OldTpl;\r
+  NVME_DEVICE_PRIVATE_DATA  *Device;\r
+  EFI_STATUS                Status;\r
+  EFI_BLOCK_IO_MEDIA        *Media;\r
+  UINTN                     BlockSize;\r
+  UINTN                     NumberOfBlocks;\r
+  UINTN                     IoAlign;\r
+  EFI_TPL                   OldTpl;\r
 \r
   //\r
   // Check parameters.\r
@@ -1117,13 +1150,13 @@ NvmeBlockIoWriteBlocks (
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
-  NumberOfBlocks  = BufferSize / BlockSize;\r
+  NumberOfBlocks = BufferSize / BlockSize;\r
   if ((Lba + NumberOfBlocks - 1) > Media->LastBlock) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   IoAlign = Media->IoAlign;\r
-  if (IoAlign > 0 && (((UINTN) Buffer & (IoAlign - 1)) != 0)) {\r
+  if ((IoAlign > 0) && (((UINTN)Buffer & (IoAlign - 1)) != 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1151,12 +1184,12 @@ NvmeBlockIoWriteBlocks (
 EFI_STATUS\r
 EFIAPI\r
 NvmeBlockIoFlushBlocks (\r
-  IN  EFI_BLOCK_IO_PROTOCOL   *This\r
+  IN  EFI_BLOCK_IO_PROTOCOL  *This\r
   )\r
 {\r
-  NVME_DEVICE_PRIVATE_DATA          *Device;\r
-  EFI_STATUS                        Status;\r
-  EFI_TPL                           OldTpl;\r
+  NVME_DEVICE_PRIVATE_DATA  *Device;\r
+  EFI_STATUS                Status;\r
+  EFI_TPL                   OldTpl;\r
 \r
   //\r
   // Check parameters.\r
@@ -1196,11 +1229,11 @@ NvmeBlockIoResetEx (
   IN BOOLEAN                 ExtendedVerification\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  NVME_DEVICE_PRIVATE_DATA        *Device;\r
-  NVME_CONTROLLER_PRIVATE_DATA    *Private;\r
-  BOOLEAN                         IsEmpty;\r
-  EFI_TPL                         OldTpl;\r
+  EFI_STATUS                    Status;\r
+  NVME_DEVICE_PRIVATE_DATA      *Device;\r
+  NVME_CONTROLLER_PRIVATE_DATA  *Private;\r
+  BOOLEAN                       IsEmpty;\r
+  EFI_TPL                       OldTpl;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1227,7 +1260,7 @@ NvmeBlockIoResetEx (
 \r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
-  Status  = NvmeControllerInit (Private);\r
+  Status = NvmeControllerInit (Private);\r
 \r
   if (EFI_ERROR (Status)) {\r
     Status = EFI_DEVICE_ERROR;\r
@@ -1278,21 +1311,21 @@ NvmeBlockIoResetEx (
 EFI_STATUS\r
 EFIAPI\r
 NvmeBlockIoReadBlocksEx (\r
-  IN     EFI_BLOCK_IO2_PROTOCOL *This,\r
-  IN     UINT32                 MediaId,\r
-  IN     EFI_LBA                Lba,\r
-  IN OUT EFI_BLOCK_IO2_TOKEN    *Token,\r
-  IN     UINTN                  BufferSize,\r
-     OUT VOID                  *Buffer\r
+  IN     EFI_BLOCK_IO2_PROTOCOL  *This,\r
+  IN     UINT32                  MediaId,\r
+  IN     EFI_LBA                 Lba,\r
+  IN OUT EFI_BLOCK_IO2_TOKEN     *Token,\r
+  IN     UINTN                   BufferSize,\r
+  OUT VOID                       *Buffer\r
   )\r
 {\r
-  NVME_DEVICE_PRIVATE_DATA        *Device;\r
-  EFI_STATUS                      Status;\r
-  EFI_BLOCK_IO_MEDIA              *Media;\r
-  UINTN                           BlockSize;\r
-  UINTN                           NumberOfBlocks;\r
-  UINTN                           IoAlign;\r
-  EFI_TPL                         OldTpl;\r
+  NVME_DEVICE_PRIVATE_DATA  *Device;\r
+  EFI_STATUS                Status;\r
+  EFI_BLOCK_IO_MEDIA        *Media;\r
+  UINTN                     BlockSize;\r
+  UINTN                     NumberOfBlocks;\r
+  UINTN                     IoAlign;\r
+  EFI_TPL                   OldTpl;\r
 \r
   //\r
   // Check parameters.\r
@@ -1316,6 +1349,7 @@ NvmeBlockIoReadBlocksEx (
       Token->TransactionStatus = EFI_SUCCESS;\r
       gBS->SignalEvent (Token->Event);\r
     }\r
+\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -1324,13 +1358,13 @@ NvmeBlockIoReadBlocksEx (
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
-  NumberOfBlocks  = BufferSize / BlockSize;\r
+  NumberOfBlocks = BufferSize / BlockSize;\r
   if ((Lba + NumberOfBlocks - 1) > Media->LastBlock) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   IoAlign = Media->IoAlign;\r
-  if (IoAlign > 0 && (((UINTN) Buffer & (IoAlign - 1)) != 0)) {\r
+  if ((IoAlign > 0) && (((UINTN)Buffer & (IoAlign - 1)) != 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1340,7 +1374,7 @@ NvmeBlockIoReadBlocksEx (
 \r
   if ((Token != NULL) && (Token->Event != NULL)) {\r
     Token->TransactionStatus = EFI_SUCCESS;\r
-    Status = NvmeAsyncRead (Device, Buffer, Lba, NumberOfBlocks, Token);\r
+    Status                   = NvmeAsyncRead (Device, Buffer, Lba, NumberOfBlocks, Token);\r
   } else {\r
     Status = NvmeRead (Device, Buffer, Lba, NumberOfBlocks);\r
   }\r
@@ -1391,20 +1425,20 @@ EFI_STATUS
 EFIAPI\r
 NvmeBlockIoWriteBlocksEx (\r
   IN     EFI_BLOCK_IO2_PROTOCOL  *This,\r
-  IN     UINT32                 MediaId,\r
-  IN     EFI_LBA                Lba,\r
-  IN OUT EFI_BLOCK_IO2_TOKEN    *Token,\r
-  IN     UINTN                  BufferSize,\r
-  IN     VOID                   *Buffer\r
+  IN     UINT32                  MediaId,\r
+  IN     EFI_LBA                 Lba,\r
+  IN OUT EFI_BLOCK_IO2_TOKEN     *Token,\r
+  IN     UINTN                   BufferSize,\r
+  IN     VOID                    *Buffer\r
   )\r
 {\r
-  NVME_DEVICE_PRIVATE_DATA        *Device;\r
-  EFI_STATUS                      Status;\r
-  EFI_BLOCK_IO_MEDIA              *Media;\r
-  UINTN                           BlockSize;\r
-  UINTN                           NumberOfBlocks;\r
-  UINTN                           IoAlign;\r
-  EFI_TPL                         OldTpl;\r
+  NVME_DEVICE_PRIVATE_DATA  *Device;\r
+  EFI_STATUS                Status;\r
+  EFI_BLOCK_IO_MEDIA        *Media;\r
+  UINTN                     BlockSize;\r
+  UINTN                     NumberOfBlocks;\r
+  UINTN                     IoAlign;\r
+  EFI_TPL                   OldTpl;\r
 \r
   //\r
   // Check parameters.\r
@@ -1428,6 +1462,7 @@ NvmeBlockIoWriteBlocksEx (
       Token->TransactionStatus = EFI_SUCCESS;\r
       gBS->SignalEvent (Token->Event);\r
     }\r
+\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -1436,13 +1471,13 @@ NvmeBlockIoWriteBlocksEx (
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
-  NumberOfBlocks  = BufferSize / BlockSize;\r
+  NumberOfBlocks = BufferSize / BlockSize;\r
   if ((Lba + NumberOfBlocks - 1) > Media->LastBlock) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   IoAlign = Media->IoAlign;\r
-  if (IoAlign > 0 && (((UINTN) Buffer & (IoAlign - 1)) != 0)) {\r
+  if ((IoAlign > 0) && (((UINTN)Buffer & (IoAlign - 1)) != 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1452,7 +1487,7 @@ NvmeBlockIoWriteBlocksEx (
 \r
   if ((Token != NULL) && (Token->Event != NULL)) {\r
     Token->TransactionStatus = EFI_SUCCESS;\r
-    Status = NvmeAsyncWrite (Device, Buffer, Lba, NumberOfBlocks, Token);\r
+    Status                   = NvmeAsyncWrite (Device, Buffer, Lba, NumberOfBlocks, Token);\r
   } else {\r
     Status = NvmeWrite (Device, Buffer, Lba, NumberOfBlocks);\r
   }\r
@@ -1488,13 +1523,13 @@ NvmeBlockIoWriteBlocksEx (
 EFI_STATUS\r
 EFIAPI\r
 NvmeBlockIoFlushBlocksEx (\r
-  IN     EFI_BLOCK_IO2_PROTOCOL   *This,\r
-  IN OUT EFI_BLOCK_IO2_TOKEN      *Token\r
+  IN     EFI_BLOCK_IO2_PROTOCOL  *This,\r
+  IN OUT EFI_BLOCK_IO2_TOKEN     *Token\r
   )\r
 {\r
-  NVME_DEVICE_PRIVATE_DATA        *Device;\r
-  BOOLEAN                         IsEmpty;\r
-  EFI_TPL                         OldTpl;\r
+  NVME_DEVICE_PRIVATE_DATA  *Device;\r
+  BOOLEAN                   IsEmpty;\r
+  EFI_TPL                   OldTpl;\r
 \r
   //\r
   // Check parameters.\r
@@ -1560,21 +1595,21 @@ NvmeBlockIoFlushBlocksEx (
 **/\r
 EFI_STATUS\r
 TrustTransferNvmeDevice (\r
-  IN OUT NVME_CONTROLLER_PRIVATE_DATA      *Private,\r
-  IN OUT VOID                              *Buffer,\r
-  IN UINT8                                 SecurityProtocolId,\r
-  IN UINT16                                SecurityProtocolSpecificData,\r
-  IN UINTN                                 TransferLength,\r
-  IN BOOLEAN                               IsTrustSend,\r
-  IN UINT64                                Timeout,\r
-  OUT UINTN                                *TransferLengthOut\r
+  IN OUT NVME_CONTROLLER_PRIVATE_DATA  *Private,\r
+  IN OUT VOID                          *Buffer,\r
+  IN UINT8                             SecurityProtocolId,\r
+  IN UINT16                            SecurityProtocolSpecificData,\r
+  IN UINTN                             TransferLength,\r
+  IN BOOLEAN                           IsTrustSend,\r
+  IN UINT64                            Timeout,\r
+  OUT UINTN                            *TransferLengthOut\r
   )\r
 {\r
-  EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET CommandPacket;\r
-  EFI_NVM_EXPRESS_COMMAND                  Command;\r
-  EFI_NVM_EXPRESS_COMPLETION               Completion;\r
-  EFI_STATUS                               Status;\r
-  UINT16                                   SpecificData;\r
+  EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET  CommandPacket;\r
+  EFI_NVM_EXPRESS_COMMAND                   Command;\r
+  EFI_NVM_EXPRESS_COMPLETION                Completion;\r
+  EFI_STATUS                                Status;\r
+  UINT16                                    SpecificData;\r
 \r
   ZeroMem (&CommandPacket, sizeof (EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
   ZeroMem (&Command, sizeof (EFI_NVM_EXPRESS_COMMAND));\r
@@ -1615,10 +1650,10 @@ TrustTransferNvmeDevice (
                                );\r
 \r
   if (!IsTrustSend) {\r
-    if (EFI_ERROR (Status))  {\r
+    if (EFI_ERROR (Status)) {\r
       *TransferLengthOut = 0;\r
     } else {\r
-      *TransferLengthOut = (UINTN) TransferLength;\r
+      *TransferLengthOut = (UINTN)TransferLength;\r
     }\r
   }\r
 \r
@@ -1700,20 +1735,20 @@ TrustTransferNvmeDevice (
 EFI_STATUS\r
 EFIAPI\r
 NvmeStorageSecurityReceiveData (\r
-  IN  EFI_STORAGE_SECURITY_COMMAND_PROTOCOL    *This,\r
-  IN  UINT32                                   MediaId,\r
-  IN  UINT64                                   Timeout,\r
-  IN  UINT8                                    SecurityProtocolId,\r
-  IN  UINT16                                   SecurityProtocolSpecificData,\r
-  IN  UINTN                                    PayloadBufferSize,\r
-  OUT VOID                                     *PayloadBuffer,\r
-  OUT UINTN                                    *PayloadTransferSize\r
+  IN  EFI_STORAGE_SECURITY_COMMAND_PROTOCOL  *This,\r
+  IN  UINT32                                 MediaId,\r
+  IN  UINT64                                 Timeout,\r
+  IN  UINT8                                  SecurityProtocolId,\r
+  IN  UINT16                                 SecurityProtocolSpecificData,\r
+  IN  UINTN                                  PayloadBufferSize,\r
+  OUT VOID                                   *PayloadBuffer,\r
+  OUT UINTN                                  *PayloadTransferSize\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  NVME_DEVICE_PRIVATE_DATA         *Device;\r
+  EFI_STATUS                Status;\r
+  NVME_DEVICE_PRIVATE_DATA  *Device;\r
 \r
-  Status  = EFI_SUCCESS;\r
+  Status = EFI_SUCCESS;\r
 \r
   if ((PayloadBuffer == NULL) || (PayloadTransferSize == NULL) || (PayloadBufferSize == 0)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1807,19 +1842,19 @@ NvmeStorageSecurityReceiveData (
 EFI_STATUS\r
 EFIAPI\r
 NvmeStorageSecuritySendData (\r
-  IN EFI_STORAGE_SECURITY_COMMAND_PROTOCOL    *This,\r
-  IN UINT32                                   MediaId,\r
-  IN UINT64                                   Timeout,\r
-  IN UINT8                                    SecurityProtocolId,\r
-  IN UINT16                                   SecurityProtocolSpecificData,\r
-  IN UINTN                                    PayloadBufferSize,\r
-  IN VOID                                     *PayloadBuffer\r
+  IN EFI_STORAGE_SECURITY_COMMAND_PROTOCOL  *This,\r
+  IN UINT32                                 MediaId,\r
+  IN UINT64                                 Timeout,\r
+  IN UINT8                                  SecurityProtocolId,\r
+  IN UINT16                                 SecurityProtocolSpecificData,\r
+  IN UINTN                                  PayloadBufferSize,\r
+  IN VOID                                   *PayloadBuffer\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  NVME_DEVICE_PRIVATE_DATA         *Device;\r
+  EFI_STATUS                Status;\r
+  NVME_DEVICE_PRIVATE_DATA  *Device;\r
 \r
-  Status  = EFI_SUCCESS;\r
+  Status = EFI_SUCCESS;\r
 \r
   if ((PayloadBuffer == NULL) && (PayloadBufferSize != 0)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1848,7 +1883,3 @@ NvmeStorageSecuritySendData (
 \r
   return Status;\r
 }\r
-\r
-\r
-\r
-\r