]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
MdeModulePkg: Apply uncrustify changes
[mirror_edk2.git] / MdeModulePkg / Universal / Disk / PartitionDxe / Partition.c
index aebc8a1dac579b829c2a1e44d378fc76adebeb62..bc8955972768116a70294eb31f440c02c67ec41f 100644 (file)
@@ -10,13 +10,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #include "Partition.h"\r
 \r
 //\r
 // Partition Driver Global Variables.\r
 //\r
-EFI_DRIVER_BINDING_PROTOCOL gPartitionDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gPartitionDriverBinding = {\r
   PartitionDriverBindingSupported,\r
   PartitionDriverBindingStart,\r
   PartitionDriverBindingStop,\r
@@ -44,7 +43,7 @@ EFI_DRIVER_BINDING_PROTOCOL gPartitionDriverBinding = {
 // Note: UDF is using a same method as booting from CD-ROM, so put it along\r
 //        with CD-ROM check.\r
 //\r
-PARTITION_DETECT_ROUTINE mPartitionDetectRoutineTable[] = {\r
+PARTITION_DETECT_ROUTINE  mPartitionDetectRoutineTable[] = {\r
   PartitionInstallGptChildHandles,\r
   PartitionInstallUdfChildHandles,\r
   PartitionInstallMbrChildHandles,\r
@@ -92,10 +91,11 @@ PartitionDriverBindingSupported (
       // If RemainingDevicePath isn't the End of Device Path Node,\r
       // check its validation\r
       //\r
-      Node = (EFI_DEV_PATH *) RemainingDevicePath;\r
-      if (Node->DevPath.Type != MEDIA_DEVICE_PATH ||\r
-        Node->DevPath.SubType != MEDIA_HARDDRIVE_DP ||\r
-        DevicePathNodeLength (&Node->DevPath) != sizeof (HARDDRIVE_DEVICE_PATH)) {\r
+      Node = (EFI_DEV_PATH *)RemainingDevicePath;\r
+      if ((Node->DevPath.Type != MEDIA_DEVICE_PATH) ||\r
+          (Node->DevPath.SubType != MEDIA_HARDDRIVE_DP) ||\r
+          (DevicePathNodeLength (&Node->DevPath) != sizeof (HARDDRIVE_DEVICE_PATH)))\r
+      {\r
         return EFI_UNSUPPORTED;\r
       }\r
     }\r
@@ -107,7 +107,7 @@ PartitionDriverBindingSupported (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiDiskIoProtocolGuid,\r
-                  (VOID **) &DiskIo,\r
+                  (VOID **)&DiskIo,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -115,9 +115,11 @@ PartitionDriverBindingSupported (
   if (Status == EFI_ALREADY_STARTED) {\r
     return EFI_SUCCESS;\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Close the I/O Abstraction(s) used to perform the supported test\r
   //\r
@@ -134,7 +136,7 @@ PartitionDriverBindingSupported (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &ParentDevicePath,\r
+                  (VOID **)&ParentDevicePath,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -151,11 +153,11 @@ PartitionDriverBindingSupported (
   // Close protocol, don't use device path protocol in the Support() function\r
   //\r
   gBS->CloseProtocol (\r
-        ControllerHandle,\r
-        &gEfiDevicePathProtocolGuid,\r
-        This->DriverBindingHandle,\r
-        ControllerHandle\r
-        );\r
+         ControllerHandle,\r
+         &gEfiDevicePathProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         ControllerHandle\r
+         );\r
 \r
   //\r
   // Open the IO Abstraction(s) needed to perform the supported test\r
@@ -207,7 +209,7 @@ PartitionDriverBindingStart (
   EFI_TPL                   OldTpl;\r
 \r
   BlockIo2 = NULL;\r
-  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl   = gBS->RaiseTPL (TPL_CALLBACK);\r
   //\r
   // Check RemainingDevicePath validation\r
   //\r
@@ -229,7 +231,7 @@ PartitionDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiBlockIoProtocolGuid,\r
-                  (VOID **) &BlockIo,\r
+                  (VOID **)&BlockIo,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -241,7 +243,7 @@ PartitionDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiBlockIo2ProtocolGuid,\r
-                  (VOID **) &BlockIo2,\r
+                  (VOID **)&BlockIo2,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -256,12 +258,12 @@ PartitionDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &ParentDevicePath,\r
+                  (VOID **)&ParentDevicePath,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
                   );\r
-  if (EFI_ERROR (Status) && Status != EFI_ALREADY_STARTED) {\r
+  if (EFI_ERROR (Status) && (Status != EFI_ALREADY_STARTED)) {\r
     goto Exit;\r
   }\r
 \r
@@ -271,18 +273,18 @@ PartitionDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiDiskIoProtocolGuid,\r
-                  (VOID **) &DiskIo,\r
+                  (VOID **)&DiskIo,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
                   );\r
-  if (EFI_ERROR (Status) && Status != EFI_ALREADY_STARTED) {\r
+  if (EFI_ERROR (Status) && (Status != EFI_ALREADY_STARTED)) {\r
     gBS->CloseProtocol (\r
-          ControllerHandle,\r
-          &gEfiDevicePathProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          ControllerHandle\r
-          );\r
+           ControllerHandle,\r
+           &gEfiDevicePathProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           ControllerHandle\r
+           );\r
     goto Exit;\r
   }\r
 \r
@@ -291,12 +293,12 @@ PartitionDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiDiskIo2ProtocolGuid,\r
-                  (VOID **) &DiskIo2,\r
+                  (VOID **)&DiskIo2,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
                   );\r
-  if (EFI_ERROR (Status) && Status != EFI_ALREADY_STARTED) {\r
+  if (EFI_ERROR (Status) && (Status != EFI_ALREADY_STARTED)) {\r
     DiskIo2 = NULL;\r
   }\r
 \r
@@ -306,7 +308,8 @@ PartitionDriverBindingStart (
   Status       = EFI_UNSUPPORTED;\r
   MediaPresent = BlockIo->Media->MediaPresent;\r
   if (BlockIo->Media->MediaPresent ||\r
-      (BlockIo->Media->RemovableMedia && !BlockIo->Media->LogicalPartition)) {\r
+      (BlockIo->Media->RemovableMedia && !BlockIo->Media->LogicalPartition))\r
+  {\r
     //\r
     // Try for GPT, then legacy MBR partition types, and then UDF and El Torito.\r
     // If the media supports a given partition type install child handles to\r
@@ -314,21 +317,23 @@ PartitionDriverBindingStart (
     //\r
     Routine = &mPartitionDetectRoutineTable[0];\r
     while (*Routine != NULL) {\r
-      Status = (*Routine) (\r
-                   This,\r
-                   ControllerHandle,\r
-                   DiskIo,\r
-                   DiskIo2,\r
-                   BlockIo,\r
-                   BlockIo2,\r
-                   ParentDevicePath\r
-                   );\r
-      if (!EFI_ERROR (Status) || Status == EFI_MEDIA_CHANGED || Status == EFI_NO_MEDIA) {\r
+      Status = (*Routine)(\r
+  This,\r
+  ControllerHandle,\r
+  DiskIo,\r
+  DiskIo2,\r
+  BlockIo,\r
+  BlockIo2,\r
+  ParentDevicePath\r
+  );\r
+      if (!EFI_ERROR (Status) || (Status == EFI_MEDIA_CHANGED) || (Status == EFI_NO_MEDIA)) {\r
         break;\r
       }\r
+\r
       Routine++;\r
     }\r
   }\r
+\r
   //\r
   // In the case that the driver is already started (OpenStatus == EFI_ALREADY_STARTED),\r
   // the DevicePathProtocol and the DiskIoProtocol are not actually opened by the\r
@@ -343,14 +348,15 @@ PartitionDriverBindingStart (
   //\r
   if (EFI_ERROR (Status)          &&\r
       !EFI_ERROR (OpenStatus)     &&\r
-      Status != EFI_MEDIA_CHANGED &&\r
-      !(MediaPresent && Status == EFI_NO_MEDIA)) {\r
+      (Status != EFI_MEDIA_CHANGED) &&\r
+      !(MediaPresent && (Status == EFI_NO_MEDIA)))\r
+  {\r
     gBS->CloseProtocol (\r
-          ControllerHandle,\r
-          &gEfiDiskIoProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          ControllerHandle\r
-          );\r
+           ControllerHandle,\r
+           &gEfiDiskIoProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           ControllerHandle\r
+           );\r
     //\r
     // Close Parent DiskIo2 if has.\r
     //\r
@@ -362,11 +368,11 @@ PartitionDriverBindingStart (
            );\r
 \r
     gBS->CloseProtocol (\r
-          ControllerHandle,\r
-          &gEfiDevicePathProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          ControllerHandle\r
-          );\r
+           ControllerHandle,\r
+           &gEfiDevicePathProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           ControllerHandle\r
+           );\r
   }\r
 \r
 Exit:\r
@@ -391,10 +397,10 @@ Exit:
 EFI_STATUS\r
 EFIAPI\r
 PartitionDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL   *This,\r
-  IN  EFI_HANDLE                    ControllerHandle,\r
-  IN  UINTN                         NumberOfChildren,\r
-  IN  EFI_HANDLE                    *ChildHandleBuffer\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  UINTN                        NumberOfChildren,\r
+  IN  EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
   EFI_STATUS              Status;\r
@@ -408,7 +414,7 @@ PartitionDriverBindingStop (
 \r
   BlockIo  = NULL;\r
   BlockIo2 = NULL;\r
-  Private = NULL;\r
+  Private  = NULL;\r
 \r
   if (NumberOfChildren == 0) {\r
     //\r
@@ -417,7 +423,7 @@ PartitionDriverBindingStop (
     // bus driver. Hence, additional check is needed here.\r
     //\r
     if (HasChildren (ControllerHandle)) {\r
-      DEBUG((DEBUG_ERROR, "PartitionDriverBindingStop: Still has child.\n"));\r
+      DEBUG ((DEBUG_ERROR, "PartitionDriverBindingStop: Still has child.\n"));\r
       return EFI_DEVICE_ERROR;\r
     }\r
 \r
@@ -425,11 +431,11 @@ PartitionDriverBindingStop (
     // Close the bus driver\r
     //\r
     gBS->CloseProtocol (\r
-          ControllerHandle,\r
-          &gEfiDiskIoProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          ControllerHandle\r
-          );\r
+           ControllerHandle,\r
+           &gEfiDiskIoProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           ControllerHandle\r
+           );\r
     //\r
     // Close Parent BlockIO2 if has.\r
     //\r
@@ -441,11 +447,11 @@ PartitionDriverBindingStop (
            );\r
 \r
     gBS->CloseProtocol (\r
-          ControllerHandle,\r
-          &gEfiDevicePathProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          ControllerHandle\r
-          );\r
+           ControllerHandle,\r
+           &gEfiDevicePathProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           ControllerHandle\r
+           );\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -454,7 +460,7 @@ PartitionDriverBindingStop (
     gBS->OpenProtocol (\r
            ChildHandleBuffer[Index],\r
            &gEfiBlockIoProtocolGuid,\r
-           (VOID **) &BlockIo,\r
+           (VOID **)&BlockIo,\r
            This->DriverBindingHandle,\r
            ControllerHandle,\r
            EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -465,13 +471,12 @@ PartitionDriverBindingStop (
     gBS->OpenProtocol (\r
            ChildHandleBuffer[Index],\r
            &gEfiBlockIo2ProtocolGuid,\r
-           (VOID **) &BlockIo2,\r
+           (VOID **)&BlockIo2,\r
            This->DriverBindingHandle,\r
            ControllerHandle,\r
            EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
            );\r
 \r
-\r
     Private = PARTITION_DEVICE_FROM_BLOCK_IO_THIS (BlockIo);\r
     if (Private->InStop) {\r
       //\r
@@ -480,13 +485,14 @@ PartitionDriverBindingStop (
       //\r
       break;\r
     }\r
+\r
     Private->InStop = TRUE;\r
 \r
     BlockIo->FlushBlocks (BlockIo);\r
 \r
     if (BlockIo2 != NULL) {\r
       Status = BlockIo2->FlushBlocksEx (BlockIo2, NULL);\r
-      DEBUG((DEBUG_ERROR, "PartitionDriverBindingStop: FlushBlocksEx returned with %r\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "PartitionDriverBindingStop: FlushBlocksEx returned with %r\n", Status));\r
     } else {\r
       Status = EFI_SUCCESS;\r
     }\r
@@ -518,33 +524,33 @@ PartitionDriverBindingStop (
       //\r
       if (Status != EFI_MEDIA_CHANGED) {\r
         Status = gBS->UninstallMultipleProtocolInterfaces (\r
-                         ChildHandleBuffer[Index],\r
-                         &gEfiDevicePathProtocolGuid,\r
-                         Private->DevicePath,\r
-                         &gEfiBlockIoProtocolGuid,\r
-                         &Private->BlockIo,\r
-                         &gEfiBlockIo2ProtocolGuid,\r
-                         &Private->BlockIo2,\r
-                         &gEfiPartitionInfoProtocolGuid,\r
-                         &Private->PartitionInfo,\r
-                         TypeGuid,\r
-                         NULL,\r
-                         NULL\r
-                         );\r
+                        ChildHandleBuffer[Index],\r
+                        &gEfiDevicePathProtocolGuid,\r
+                        Private->DevicePath,\r
+                        &gEfiBlockIoProtocolGuid,\r
+                        &Private->BlockIo,\r
+                        &gEfiBlockIo2ProtocolGuid,\r
+                        &Private->BlockIo2,\r
+                        &gEfiPartitionInfoProtocolGuid,\r
+                        &Private->PartitionInfo,\r
+                        TypeGuid,\r
+                        NULL,\r
+                        NULL\r
+                        );\r
       }\r
     } else {\r
       Status = gBS->UninstallMultipleProtocolInterfaces (\r
-                       ChildHandleBuffer[Index],\r
-                       &gEfiDevicePathProtocolGuid,\r
-                       Private->DevicePath,\r
-                       &gEfiBlockIoProtocolGuid,\r
-                       &Private->BlockIo,\r
-                       &gEfiPartitionInfoProtocolGuid,\r
-                       &Private->PartitionInfo,\r
-                       TypeGuid,\r
-                       NULL,\r
-                       NULL\r
-                       );\r
+                      ChildHandleBuffer[Index],\r
+                      &gEfiDevicePathProtocolGuid,\r
+                      Private->DevicePath,\r
+                      &gEfiBlockIoProtocolGuid,\r
+                      &Private->BlockIo,\r
+                      &gEfiPartitionInfoProtocolGuid,\r
+                      &Private->PartitionInfo,\r
+                      TypeGuid,\r
+                      NULL,\r
+                      NULL\r
+                      );\r
     }\r
 \r
     if (EFI_ERROR (Status)) {\r
@@ -552,7 +558,7 @@ PartitionDriverBindingStop (
       gBS->OpenProtocol (\r
              ControllerHandle,\r
              &gEfiDiskIoProtocolGuid,\r
-             (VOID **) &DiskIo,\r
+             (VOID **)&DiskIo,\r
              This->DriverBindingHandle,\r
              ChildHandleBuffer[Index],\r
              EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -577,7 +583,6 @@ PartitionDriverBindingStop (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Reset the Block Device.\r
 \r
@@ -601,9 +606,9 @@ PartitionReset (
   Private = PARTITION_DEVICE_FROM_BLOCK_IO_THIS (This);\r
 \r
   return Private->ParentBlockIo->Reset (\r
-                                  Private->ParentBlockIo,\r
-                                  ExtendedVerification\r
-                                  );\r
+                                   Private->ParentBlockIo,\r
+                                   ExtendedVerification\r
+                                   );\r
 }\r
 \r
 /**\r
@@ -621,13 +626,13 @@ PartitionReset (
 **/\r
 EFI_STATUS\r
 ProbeMediaStatus (\r
-  IN EFI_DISK_IO_PROTOCOL    *DiskIo,\r
-  IN UINT32                  MediaId,\r
-  IN EFI_STATUS              DefaultStatus\r
+  IN EFI_DISK_IO_PROTOCOL  *DiskIo,\r
+  IN UINT32                MediaId,\r
+  IN EFI_STATUS            DefaultStatus\r
   )\r
 {\r
-  EFI_STATUS                 Status;\r
-  UINT8                      Buffer[1];\r
+  EFI_STATUS  Status;\r
+  UINT8       Buffer[1];\r
 \r
   //\r
   // Read 1 byte from offset 0 to check if the MediaId is still valid.\r
@@ -635,10 +640,11 @@ ProbeMediaStatus (
   // allocate a buffer from the pool. The destination buffer for the\r
   // data is in the stack.\r
   //\r
-  Status = DiskIo->ReadDisk (DiskIo, MediaId, 0, 1, (VOID*)Buffer);\r
+  Status = DiskIo->ReadDisk (DiskIo, MediaId, 0, 1, (VOID *)Buffer);\r
   if ((Status == EFI_NO_MEDIA) || (Status == EFI_MEDIA_CHANGED)) {\r
     return Status;\r
   }\r
+\r
   return DefaultStatus;\r
 }\r
 \r
@@ -684,6 +690,7 @@ PartitionReadBlocks (
   if (Offset + BufferSize > Private->End) {\r
     return ProbeMediaStatus (Private->DiskIo, MediaId, EFI_INVALID_PARAMETER);\r
   }\r
+\r
   //\r
   // Because some kinds of partition have different block size from their parent\r
   // device, we call the Disk IO protocol on the parent device, not the Block IO\r
@@ -719,7 +726,7 @@ PartitionWriteBlocks (
   IN UINT32                 MediaId,\r
   IN EFI_LBA                Lba,\r
   IN UINTN                  BufferSize,\r
-  IN VOID                  *Buffer\r
+  IN VOID                   *Buffer\r
   )\r
 {\r
   PARTITION_PRIVATE_DATA  *Private;\r
@@ -735,6 +742,7 @@ PartitionWriteBlocks (
   if (Offset + BufferSize > Private->End) {\r
     return ProbeMediaStatus (Private->DiskIo, MediaId, EFI_INVALID_PARAMETER);\r
   }\r
+\r
   //\r
   // Because some kinds of partition have different block size from their parent\r
   // device, we call the Disk IO protocol on the parent device, not the Block IO\r
@@ -743,7 +751,6 @@ PartitionWriteBlocks (
   return Private->DiskIo->WriteDisk (Private->DiskIo, MediaId, Offset, BufferSize, Buffer);\r
 }\r
 \r
-\r
 /**\r
   Flush the parent Block Device.\r
 \r
@@ -782,13 +789,13 @@ PartitionFlushBlocks (
 **/\r
 EFI_STATUS\r
 ProbeMediaStatusEx (\r
-  IN EFI_DISK_IO2_PROTOCOL   *DiskIo2,\r
-  IN UINT32                  MediaId,\r
-  IN EFI_STATUS              DefaultStatus\r
+  IN EFI_DISK_IO2_PROTOCOL  *DiskIo2,\r
+  IN UINT32                 MediaId,\r
+  IN EFI_STATUS             DefaultStatus\r
   )\r
 {\r
-  EFI_STATUS                 Status;\r
-  UINT8                      Buffer[1];\r
+  EFI_STATUS  Status;\r
+  UINT8       Buffer[1];\r
 \r
   //\r
   // Read 1 byte from offset 0 to check if the MediaId is still valid.\r
@@ -796,10 +803,11 @@ ProbeMediaStatusEx (
   // allocate a buffer from the pool. The destination buffer for the\r
   // data is in the stack.\r
   //\r
-  Status = DiskIo2->ReadDiskEx (DiskIo2, MediaId, 0, NULL, 1, (VOID*)Buffer);\r
+  Status = DiskIo2->ReadDiskEx (DiskIo2, MediaId, 0, NULL, 1, (VOID *)Buffer);\r
   if ((Status == EFI_NO_MEDIA) || (Status == EFI_MEDIA_CHANGED)) {\r
     return Status;\r
   }\r
+\r
   return DefaultStatus;\r
 }\r
 \r
@@ -817,8 +825,8 @@ ProbeMediaStatusEx (
 EFI_STATUS\r
 EFIAPI\r
 PartitionResetEx (\r
-  IN EFI_BLOCK_IO2_PROTOCOL *This,\r
-  IN BOOLEAN                ExtendedVerification\r
+  IN EFI_BLOCK_IO2_PROTOCOL  *This,\r
+  IN BOOLEAN                 ExtendedVerification\r
   )\r
 {\r
   PARTITION_PRIVATE_DATA  *Private;\r
@@ -840,13 +848,13 @@ PartitionResetEx (
 VOID\r
 EFIAPI\r
 PartitionOnAccessComplete (\r
-  IN EFI_EVENT                 Event,\r
-  IN VOID                      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  PARTITION_ACCESS_TASK   *Task;\r
+  PARTITION_ACCESS_TASK  *Task;\r
 \r
-  Task = (PARTITION_ACCESS_TASK *) Context;\r
+  Task = (PARTITION_ACCESS_TASK *)Context;\r
 \r
   gBS->CloseEvent (Event);\r
 \r
@@ -865,11 +873,11 @@ PartitionOnAccessComplete (
 **/\r
 PARTITION_ACCESS_TASK *\r
 PartitionCreateAccessTask (\r
-  IN EFI_BLOCK_IO2_TOKEN    *Token\r
+  IN EFI_BLOCK_IO2_TOKEN  *Token\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  PARTITION_ACCESS_TASK     *Task;\r
+  EFI_STATUS             Status;\r
+  PARTITION_ACCESS_TASK  *Task;\r
 \r
   Task = AllocatePool (sizeof (*Task));\r
   if (Task == NULL) {\r
@@ -929,12 +937,12 @@ PartitionCreateAccessTask (
 EFI_STATUS\r
 EFIAPI\r
 PartitionReadBlocksEx (\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
   EFI_STATUS              Status;\r
@@ -1005,12 +1013,12 @@ PartitionReadBlocksEx (
 EFI_STATUS\r
 EFIAPI\r
 PartitionWriteBlocksEx (\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     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
   )\r
 {\r
   EFI_STATUS              Status;\r
@@ -1043,6 +1051,7 @@ PartitionWriteBlocksEx (
   } else {\r
     Status = Private->DiskIo2->WriteDiskEx (Private->DiskIo2, MediaId, Offset, NULL, BufferSize, Buffer);\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -1071,8 +1080,8 @@ PartitionWriteBlocksEx (
 EFI_STATUS\r
 EFIAPI\r
 PartitionFlushBlocksEx (\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
   EFI_STATUS              Status;\r
@@ -1095,10 +1104,10 @@ PartitionFlushBlocksEx (
   } else {\r
     Status = Private->DiskIo2->FlushDiskEx (Private->DiskIo2, NULL);\r
   }\r
+\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Create a child handle for a logical block device that represents the\r
   bytes Start to End of the Parent Block IO device.\r
@@ -1147,60 +1156,60 @@ PartitionInstallChildHandle (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Private->Signature        = PARTITION_PRIVATE_DATA_SIGNATURE;\r
+  Private->Signature = PARTITION_PRIVATE_DATA_SIGNATURE;\r
 \r
-  Private->Start            = MultU64x32 (Start, ParentBlockIo->Media->BlockSize);\r
-  Private->End              = MultU64x32 (End + 1, ParentBlockIo->Media->BlockSize);\r
+  Private->Start = MultU64x32 (Start, ParentBlockIo->Media->BlockSize);\r
+  Private->End   = MultU64x32 (End + 1, ParentBlockIo->Media->BlockSize);\r
 \r
-  Private->BlockSize        = BlockSize;\r
-  Private->ParentBlockIo    = ParentBlockIo;\r
-  Private->ParentBlockIo2   = ParentBlockIo2;\r
-  Private->DiskIo           = ParentDiskIo;\r
-  Private->DiskIo2          = ParentDiskIo2;\r
+  Private->BlockSize      = BlockSize;\r
+  Private->ParentBlockIo  = ParentBlockIo;\r
+  Private->ParentBlockIo2 = ParentBlockIo2;\r
+  Private->DiskIo         = ParentDiskIo;\r
+  Private->DiskIo2        = ParentDiskIo2;\r
 \r
   //\r
   // Set the BlockIO into Private Data.\r
   //\r
   Private->BlockIo.Revision = ParentBlockIo->Revision;\r
 \r
-  Private->BlockIo.Media    = &Private->Media;\r
+  Private->BlockIo.Media = &Private->Media;\r
   CopyMem (Private->BlockIo.Media, ParentBlockIo->Media, sizeof (EFI_BLOCK_IO_MEDIA));\r
 \r
-  Private->BlockIo.Reset        = PartitionReset;\r
-  Private->BlockIo.ReadBlocks   = PartitionReadBlocks;\r
-  Private->BlockIo.WriteBlocks  = PartitionWriteBlocks;\r
-  Private->BlockIo.FlushBlocks  = PartitionFlushBlocks;\r
+  Private->BlockIo.Reset       = PartitionReset;\r
+  Private->BlockIo.ReadBlocks  = PartitionReadBlocks;\r
+  Private->BlockIo.WriteBlocks = PartitionWriteBlocks;\r
+  Private->BlockIo.FlushBlocks = PartitionFlushBlocks;\r
 \r
   //\r
   // Set the BlockIO2 into Private Data.\r
   //\r
   if (Private->DiskIo2 != NULL) {\r
     ASSERT (Private->ParentBlockIo2 != NULL);\r
-    Private->BlockIo2.Media    = &Private->Media2;\r
+    Private->BlockIo2.Media = &Private->Media2;\r
     CopyMem (Private->BlockIo2.Media, ParentBlockIo2->Media, sizeof (EFI_BLOCK_IO_MEDIA));\r
 \r
-    Private->BlockIo2.Reset          = PartitionResetEx;\r
-    Private->BlockIo2.ReadBlocksEx   = PartitionReadBlocksEx;\r
-    Private->BlockIo2.WriteBlocksEx  = PartitionWriteBlocksEx;\r
-    Private->BlockIo2.FlushBlocksEx  = PartitionFlushBlocksEx;\r
+    Private->BlockIo2.Reset         = PartitionResetEx;\r
+    Private->BlockIo2.ReadBlocksEx  = PartitionReadBlocksEx;\r
+    Private->BlockIo2.WriteBlocksEx = PartitionWriteBlocksEx;\r
+    Private->BlockIo2.FlushBlocksEx = PartitionFlushBlocksEx;\r
   }\r
 \r
-  Private->Media.IoAlign   = 0;\r
+  Private->Media.IoAlign          = 0;\r
   Private->Media.LogicalPartition = TRUE;\r
-  Private->Media.LastBlock = DivU64x32 (\r
-                               MultU64x32 (\r
-                                 End - Start + 1,\r
-                                 ParentBlockIo->Media->BlockSize\r
-                                 ),\r
-                                BlockSize\r
-                               ) - 1;\r
+  Private->Media.LastBlock        = DivU64x32 (\r
+                                      MultU64x32 (\r
+                                        End - Start + 1,\r
+                                        ParentBlockIo->Media->BlockSize\r
+                                        ),\r
+                                      BlockSize\r
+                                      ) - 1;\r
 \r
-  Private->Media.BlockSize = (UINT32) BlockSize;\r
+  Private->Media.BlockSize = (UINT32)BlockSize;\r
 \r
-  Private->Media2.IoAlign   = 0;\r
+  Private->Media2.IoAlign          = 0;\r
   Private->Media2.LogicalPartition = TRUE;\r
-  Private->Media2.LastBlock = Private->Media.LastBlock;\r
-  Private->Media2.BlockSize = (UINT32) BlockSize;\r
+  Private->Media2.LastBlock        = Private->Media.LastBlock;\r
+  Private->Media2.BlockSize        = (UINT32)BlockSize;\r
 \r
   //\r
   // Per UEFI Spec, LowestAlignedLba, LogicalBlocksPerPhysicalBlock and OptimalTransferLengthGranularity must be 0\r
@@ -1217,7 +1226,7 @@ PartitionInstallChildHandle (
     }\r
   }\r
 \r
-  Private->DevicePath     = AppendDevicePathNode (ParentDevicePath, DevicePathNode);\r
+  Private->DevicePath = AppendDevicePathNode (ParentDevicePath, DevicePathNode);\r
 \r
   if (Private->DevicePath == NULL) {\r
     FreePool (Private);\r
@@ -1230,7 +1239,7 @@ PartitionInstallChildHandle (
   CopyMem (&Private->PartitionInfo, PartitionInfo, sizeof (EFI_PARTITION_INFO_PROTOCOL));\r
 \r
   if (TypeGuid != NULL) {\r
-    CopyGuid(&(Private->TypeGuid), TypeGuid);\r
+    CopyGuid (&(Private->TypeGuid), TypeGuid);\r
   } else {\r
     ZeroMem ((VOID *)&(Private->TypeGuid), sizeof (EFI_GUID));\r
   }\r
@@ -1276,7 +1285,7 @@ PartitionInstallChildHandle (
     Status = gBS->OpenProtocol (\r
                     ParentHandle,\r
                     &gEfiDiskIoProtocolGuid,\r
-                    (VOID **) &ParentDiskIo,\r
+                    (VOID **)&ParentDiskIo,\r
                     This->DriverBindingHandle,\r
                     Private->Handle,\r
                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -1298,7 +1307,6 @@ PartitionInstallChildHandle (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   The user Entry Point for module Partition. The user code starts with this function.\r
 \r
@@ -1312,11 +1320,11 @@ PartitionInstallChildHandle (
 EFI_STATUS\r
 EFIAPI\r
 InitializePartition (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Install driver model protocol(s).\r
@@ -1331,11 +1339,9 @@ InitializePartition (
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Test to see if there is any child on ControllerHandle.\r
 \r
@@ -1347,7 +1353,7 @@ InitializePartition (
 **/\r
 BOOLEAN\r
 HasChildren (\r
-  IN EFI_HANDLE           ControllerHandle\r
+  IN EFI_HANDLE  ControllerHandle\r
   )\r
 {\r
   EFI_OPEN_PROTOCOL_INFORMATION_ENTRY  *OpenInfoBuffer;\r
@@ -1368,7 +1374,8 @@ HasChildren (
       break;\r
     }\r
   }\r
+\r
   FreePool (OpenInfoBuffer);\r
 \r
-  return (BOOLEAN) (Index < EntryCount);\r
+  return (BOOLEAN)(Index < EntryCount);\r
 }\r