]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
MdeModulePkg: Apply uncrustify changes
[mirror_edk2.git] / MdeModulePkg / Bus / Ufs / UfsPassThruDxe / UfsPassThruHci.c
index 0b1030ab47888e8814c9bc816fe2881385b71b6b..eba35cc669f52cc4c0655f1c3315e873dc9feca3 100644 (file)
@@ -25,9 +25,9 @@
 **/\r
 EFI_STATUS\r
 UfsMmioRead32 (\r
-  IN     UFS_PASS_THRU_PRIVATE_DATA   *Private,\r
-  IN     UINTN                        Offset,\r
-     OUT UINT32                       *Value\r
+  IN     UFS_PASS_THRU_PRIVATE_DATA  *Private,\r
+  IN     UINTN                       Offset,\r
+  OUT UINT32                         *Value\r
   )\r
 {\r
   EDKII_UFS_HOST_CONTROLLER_PROTOCOL  *UfsHc;\r
@@ -55,9 +55,9 @@ UfsMmioRead32 (
 **/\r
 EFI_STATUS\r
 UfsMmioWrite32 (\r
-  IN  UFS_PASS_THRU_PRIVATE_DATA   *Private,\r
-  IN  UINTN                        Offset,\r
-  IN  UINT32                       Value\r
+  IN  UFS_PASS_THRU_PRIVATE_DATA  *Private,\r
+  IN  UINTN                       Offset,\r
+  IN  UINT32                      Value\r
   )\r
 {\r
   EDKII_UFS_HOST_CONTROLLER_PROTOCOL  *UfsHc;\r
@@ -87,17 +87,17 @@ UfsMmioWrite32 (
 **/\r
 EFI_STATUS\r
 UfsWaitMemSet (\r
-  IN  UFS_PASS_THRU_PRIVATE_DATA   *Private,\r
-  IN  UINTN                        Offset,\r
-  IN  UINT32                       MaskValue,\r
-  IN  UINT32                       TestValue,\r
-  IN  UINT64                       Timeout\r
+  IN  UFS_PASS_THRU_PRIVATE_DATA  *Private,\r
+  IN  UINTN                       Offset,\r
+  IN  UINT32                      MaskValue,\r
+  IN  UINT32                      TestValue,\r
+  IN  UINT64                      Timeout\r
   )\r
 {\r
-  UINT32     Value;\r
-  UINT64     Delay;\r
-  BOOLEAN    InfiniteWait;\r
-  EFI_STATUS Status;\r
+  UINT32      Value;\r
+  UINT64      Delay;\r
+  BOOLEAN     InfiniteWait;\r
+  EFI_STATUS  Status;\r
 \r
   if (Timeout == 0) {\r
     InfiniteWait = TRUE;\r
@@ -128,7 +128,6 @@ UfsWaitMemSet (
     MicroSecondDelay (1);\r
 \r
     Delay--;\r
-\r
   } while (InfiniteWait || (Delay > 0));\r
 \r
   return EFI_TIMEOUT;\r
@@ -143,8 +142,8 @@ UfsWaitMemSet (
 **/\r
 VOID\r
 DumpUicCmdExecResult (\r
-  IN  UINT8     UicOpcode,\r
-  IN  UINT8     Result\r
+  IN  UINT8  UicOpcode,\r
+  IN  UINT8  Result\r
   )\r
 {\r
   if (UicOpcode <= UfsUicDmePeerSet) {\r
@@ -181,7 +180,7 @@ DumpUicCmdExecResult (
       case 0x0A:\r
         DEBUG ((DEBUG_VERBOSE, "UIC configuration command fails - DME_FAILURE\n"));\r
         break;\r
-      default :\r
+      default:\r
         ASSERT (FALSE);\r
         break;\r
     }\r
@@ -192,7 +191,7 @@ DumpUicCmdExecResult (
       case 0x01:\r
         DEBUG ((DEBUG_VERBOSE, "UIC control command fails - FAILURE\n"));\r
         break;\r
-      default :\r
+      default:\r
         ASSERT (FALSE);\r
         break;\r
     }\r
@@ -207,7 +206,7 @@ DumpUicCmdExecResult (
 **/\r
 VOID\r
 DumpQueryResponseResult (\r
-  IN  UINT8     Result\r
+  IN  UINT8  Result\r
   )\r
 {\r
   switch (Result) {\r
@@ -241,7 +240,7 @@ DumpQueryResponseResult (
     case 0xFF:\r
       DEBUG ((DEBUG_VERBOSE, "Query Response with General Failure\n"));\r
       break;\r
-    default :\r
+    default:\r
       ASSERT (FALSE);\r
       break;\r
   }\r
@@ -257,18 +256,18 @@ DumpQueryResponseResult (
 **/\r
 VOID\r
 SwapLittleEndianToBigEndian (\r
-  IN OUT UINT8         *Buffer,\r
-  IN     UINT32        BufferSize\r
+  IN OUT UINT8   *Buffer,\r
+  IN     UINT32  BufferSize\r
   )\r
 {\r
-  UINT32 Index;\r
-  UINT8  Temp;\r
-  UINT32 SwapCount;\r
+  UINT32  Index;\r
+  UINT8   Temp;\r
+  UINT32  SwapCount;\r
 \r
   SwapCount = BufferSize / 2;\r
   for (Index = 0; Index < SwapCount; Index++) {\r
-    Temp = Buffer[Index];\r
-    Buffer[Index] = Buffer[BufferSize - 1 - Index];\r
+    Temp                           = Buffer[Index];\r
+    Buffer[Index]                  = Buffer[BufferSize - 1 - Index];\r
     Buffer[BufferSize - 1 - Index] = Temp;\r
   }\r
 }\r
@@ -287,32 +286,32 @@ SwapLittleEndianToBigEndian (
 **/\r
 VOID\r
 UfsFillTsfOfQueryReqUpiu (\r
-  IN OUT UTP_UPIU_TSF        *TsfBase,\r
-  IN     UINT8               Opcode,\r
-  IN     UINT8               DescId    OPTIONAL,\r
-  IN     UINT8               Index     OPTIONAL,\r
-  IN     UINT8               Selector  OPTIONAL,\r
-  IN     UINT16              Length    OPTIONAL,\r
-  IN     UINT32              Value     OPTIONAL\r
+  IN OUT UTP_UPIU_TSF  *TsfBase,\r
+  IN     UINT8         Opcode,\r
+  IN     UINT8         DescId    OPTIONAL,\r
+  IN     UINT8         Index     OPTIONAL,\r
+  IN     UINT8         Selector  OPTIONAL,\r
+  IN     UINT16        Length    OPTIONAL,\r
+  IN     UINT32        Value     OPTIONAL\r
   )\r
 {\r
   ASSERT (TsfBase != NULL);\r
   ASSERT (Opcode <= UtpQueryFuncOpcodeTogFlag);\r
 \r
-  TsfBase->Opcode   = Opcode;\r
+  TsfBase->Opcode = Opcode;\r
   if (Opcode != UtpQueryFuncOpcodeNop) {\r
     TsfBase->DescId   = DescId;\r
     TsfBase->Index    = Index;\r
     TsfBase->Selector = Selector;\r
 \r
     if ((Opcode == UtpQueryFuncOpcodeRdDesc) || (Opcode == UtpQueryFuncOpcodeWrDesc)) {\r
-      SwapLittleEndianToBigEndian ((UINT8*)&Length, sizeof (Length));\r
+      SwapLittleEndianToBigEndian ((UINT8 *)&Length, sizeof (Length));\r
       TsfBase->Length = Length;\r
     }\r
 \r
     if (Opcode == UtpQueryFuncOpcodeWrAttr) {\r
-      SwapLittleEndianToBigEndian ((UINT8*)&Value, sizeof (Value));\r
-      TsfBase->Value  = Value;\r
+      SwapLittleEndianToBigEndian ((UINT8 *)&Value, sizeof (Value));\r
+      TsfBase->Value = Value;\r
     }\r
   }\r
 }\r
@@ -333,16 +332,16 @@ UfsFillTsfOfQueryReqUpiu (
 **/\r
 EFI_STATUS\r
 UfsInitCommandUpiu (\r
-  IN OUT UTP_COMMAND_UPIU              *Command,\r
-  IN     UINT8                         Lun,\r
-  IN     UINT8                         TaskTag,\r
-  IN     UINT8                         *Cdb,\r
-  IN     UINT8                         CdbLength,\r
-  IN     UFS_DATA_DIRECTION            DataDirection,\r
-  IN     UINT32                        ExpDataTranLen\r
+  IN OUT UTP_COMMAND_UPIU    *Command,\r
+  IN     UINT8               Lun,\r
+  IN     UINT8               TaskTag,\r
+  IN     UINT8               *Cdb,\r
+  IN     UINT8               CdbLength,\r
+  IN     UFS_DATA_DIRECTION  DataDirection,\r
+  IN     UINT32              ExpDataTranLen\r
   )\r
 {\r
-  UINT8                   Flags;\r
+  UINT8  Flags;\r
 \r
   ASSERT ((Command != NULL) && (Cdb != NULL));\r
 \r
@@ -365,7 +364,7 @@ UfsInitCommandUpiu (
   Command->Lun       = Lun;\r
   Command->TaskTag   = TaskTag;\r
   Command->CmdSet    = 0x00;\r
-  SwapLittleEndianToBigEndian ((UINT8*)&ExpDataTranLen, sizeof (ExpDataTranLen));\r
+  SwapLittleEndianToBigEndian ((UINT8 *)&ExpDataTranLen, sizeof (ExpDataTranLen));\r
   Command->ExpDataTranLen = ExpDataTranLen;\r
 \r
   CopyMem (Command->Cdb, Cdb, CdbLength);\r
@@ -385,15 +384,15 @@ UfsInitCommandUpiu (
 **/\r
 EFI_STATUS\r
 UfsInitUtpPrdt (\r
-  IN  UTP_TR_PRD                       *Prdt,\r
-  IN  VOID                             *Buffer,\r
-  IN  UINT32                           BufferSize\r
+  IN  UTP_TR_PRD  *Prdt,\r
+  IN  VOID        *Buffer,\r
+  IN  UINT32      BufferSize\r
   )\r
 {\r
-  UINT32     PrdtIndex;\r
-  UINT32     RemainingLen;\r
-  UINT8      *Remaining;\r
-  UINTN      PrdtNumber;\r
+  UINT32  PrdtIndex;\r
+  UINT32  RemainingLen;\r
+  UINT8   *Remaining;\r
+  UINTN   PrdtNumber;\r
 \r
   ASSERT (((UINTN)Buffer & (BIT0 | BIT1)) == 0);\r
   ASSERT ((BufferSize & (BIT1 | BIT0)) == 0);\r
@@ -415,8 +414,8 @@ UfsInitUtpPrdt (
 \r
     Prdt[PrdtIndex].DbAddr  = (UINT32)RShiftU64 ((UINT64)(UINTN)Remaining, 2);\r
     Prdt[PrdtIndex].DbAddrU = (UINT32)RShiftU64 ((UINT64)(UINTN)Remaining, 32);\r
-    RemainingLen -= UFS_MAX_DATA_LEN_PER_PRD;\r
-    Remaining    += UFS_MAX_DATA_LEN_PER_PRD;\r
+    RemainingLen           -= UFS_MAX_DATA_LEN_PER_PRD;\r
+    Remaining              += UFS_MAX_DATA_LEN_PER_PRD;\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -439,14 +438,14 @@ UfsInitUtpPrdt (
 **/\r
 EFI_STATUS\r
 UfsInitQueryRequestUpiu (\r
-  IN OUT UTP_QUERY_REQ_UPIU            *QueryReq,\r
-  IN     UINT8                         TaskTag,\r
-  IN     UINT8                         Opcode,\r
-  IN     UINT8                         DescId,\r
-  IN     UINT8                         Index,\r
-  IN     UINT8                         Selector,\r
-  IN     UINTN                         DataSize   OPTIONAL,\r
-  IN     UINT8                         *Data      OPTIONAL\r
+  IN OUT UTP_QUERY_REQ_UPIU  *QueryReq,\r
+  IN     UINT8               TaskTag,\r
+  IN     UINT8               Opcode,\r
+  IN     UINT8               DescId,\r
+  IN     UINT8               Index,\r
+  IN     UINT8               Selector,\r
+  IN     UINTN               DataSize   OPTIONAL,\r
+  IN     UINT8               *Data      OPTIONAL\r
   )\r
 {\r
   ASSERT (QueryReq != NULL);\r
@@ -460,7 +459,7 @@ UfsInitQueryRequestUpiu (
   }\r
 \r
   if (Opcode == UtpQueryFuncOpcodeWrAttr) {\r
-    UfsFillTsfOfQueryReqUpiu (&QueryReq->Tsf, Opcode, DescId, Index, Selector, 0, *(UINT32*)Data);\r
+    UfsFillTsfOfQueryReqUpiu (&QueryReq->Tsf, Opcode, DescId, Index, Selector, 0, *(UINT32 *)Data);\r
   } else if ((Opcode == UtpQueryFuncOpcodeRdDesc) || (Opcode == UtpQueryFuncOpcodeWrDesc)) {\r
     UfsFillTsfOfQueryReqUpiu (&QueryReq->Tsf, Opcode, DescId, Index, Selector, (UINT16)DataSize, 0);\r
   } else {\r
@@ -470,7 +469,7 @@ UfsInitQueryRequestUpiu (
   if (Opcode == UtpQueryFuncOpcodeWrDesc) {\r
     CopyMem (QueryReq + 1, Data, DataSize);\r
 \r
-    SwapLittleEndianToBigEndian ((UINT8*)&DataSize, sizeof (UINT16));\r
+    SwapLittleEndianToBigEndian ((UINT8 *)&DataSize, sizeof (UINT16));\r
     QueryReq->DataSegLen = (UINT16)DataSize;\r
   }\r
 \r
@@ -498,17 +497,17 @@ UfsCreateScsiCommandDesc (
   IN     UINT8                                       Lun,\r
   IN     EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet,\r
   IN     UTP_TRD                                     *Trd,\r
-     OUT VOID                                        **CmdDescHost,\r
-     OUT VOID                                        **CmdDescMapping\r
+  OUT VOID                                           **CmdDescHost,\r
+  OUT VOID                                           **CmdDescMapping\r
   )\r
 {\r
-  UINTN                             TotalLen;\r
-  UINTN                             PrdtNumber;\r
-  UTP_COMMAND_UPIU                  *CommandUpiu;\r
-  EFI_PHYSICAL_ADDRESS              CmdDescPhyAddr;\r
-  EFI_STATUS                        Status;\r
-  UINT32                            DataLen;\r
-  UFS_DATA_DIRECTION                DataDirection;\r
+  UINTN                 TotalLen;\r
+  UINTN                 PrdtNumber;\r
+  UTP_COMMAND_UPIU      *CommandUpiu;\r
+  EFI_PHYSICAL_ADDRESS  CmdDescPhyAddr;\r
+  EFI_STATUS            Status;\r
+  UINT32                DataLen;\r
+  UFS_DATA_DIRECTION    DataDirection;\r
 \r
   ASSERT ((Private != NULL) && (Packet != NULL) && (Trd != NULL));\r
 \r
@@ -526,14 +525,14 @@ UfsCreateScsiCommandDesc (
 \r
   PrdtNumber = (UINTN)DivU64x32 ((UINT64)DataLen + UFS_MAX_DATA_LEN_PER_PRD - 1, UFS_MAX_DATA_LEN_PER_PRD);\r
 \r
-  TotalLen   = ROUNDUP8 (sizeof (UTP_COMMAND_UPIU)) + ROUNDUP8 (sizeof (UTP_RESPONSE_UPIU)) + PrdtNumber * sizeof (UTP_TR_PRD);\r
+  TotalLen = ROUNDUP8 (sizeof (UTP_COMMAND_UPIU)) + ROUNDUP8 (sizeof (UTP_RESPONSE_UPIU)) + PrdtNumber * sizeof (UTP_TR_PRD);\r
 \r
   Status = UfsAllocateAlignCommonBuffer (Private, TotalLen, CmdDescHost, &CmdDescPhyAddr, CmdDescMapping);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  CommandUpiu = (UTP_COMMAND_UPIU*)*CmdDescHost;\r
+  CommandUpiu = (UTP_COMMAND_UPIU *)*CmdDescHost;\r
 \r
   UfsInitCommandUpiu (CommandUpiu, Lun, Private->TaskTag++, Packet->Cdb, Packet->CdbLength, DataDirection, DataLen);\r
 \r
@@ -575,18 +574,18 @@ UfsCreateDMCommandDesc (
   IN     UFS_PASS_THRU_PRIVATE_DATA            *Private,\r
   IN     UFS_DEVICE_MANAGEMENT_REQUEST_PACKET  *Packet,\r
   IN     UTP_TRD                               *Trd,\r
-     OUT VOID                                  **CmdDescHost,\r
-     OUT VOID                                  **CmdDescMapping\r
+  OUT VOID                                     **CmdDescHost,\r
+  OUT VOID                                     **CmdDescMapping\r
   )\r
 {\r
-  UINTN                         TotalLen;\r
-  UTP_QUERY_REQ_UPIU            *QueryReqUpiu;\r
-  UINT8                         Opcode;\r
-  UINT32                        DataSize;\r
-  UINT8                         *Data;\r
-  UINT8                         DataDirection;\r
-  EFI_PHYSICAL_ADDRESS          CmdDescPhyAddr;\r
-  EFI_STATUS                    Status;\r
+  UINTN                 TotalLen;\r
+  UTP_QUERY_REQ_UPIU    *QueryReqUpiu;\r
+  UINT8                 Opcode;\r
+  UINT32                DataSize;\r
+  UINT8                 *Data;\r
+  UINT8                 DataDirection;\r
+  EFI_PHYSICAL_ADDRESS  CmdDescPhyAddr;\r
+  EFI_STATUS            Status;\r
 \r
   ASSERT ((Private != NULL) && (Packet != NULL) && (Trd != NULL));\r
 \r
@@ -600,9 +599,10 @@ UfsCreateDMCommandDesc (
   Data          = Packet->DataBuffer;\r
 \r
   if ((Opcode == UtpQueryFuncOpcodeWrDesc) || (Opcode == UtpQueryFuncOpcodeRdDesc)) {\r
-    if (DataSize == 0 || Data == NULL) {\r
+    if ((DataSize == 0) || (Data == NULL)) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     TotalLen = ROUNDUP8 (sizeof (UTP_QUERY_REQ_UPIU)) + ROUNDUP8 (sizeof (UTP_QUERY_RESP_UPIU)) + ROUNDUP8 (DataSize);\r
   } else {\r
     TotalLen = ROUNDUP8 (sizeof (UTP_QUERY_REQ_UPIU)) + ROUNDUP8 (sizeof (UTP_QUERY_RESP_UPIU));\r
@@ -616,7 +616,7 @@ UfsCreateDMCommandDesc (
   //\r
   // Initialize UTP QUERY REQUEST UPIU\r
   //\r
-  QueryReqUpiu = (UTP_QUERY_REQ_UPIU*)*CmdDescHost;\r
+  QueryReqUpiu = (UTP_QUERY_REQ_UPIU *)*CmdDescHost;\r
   ASSERT (QueryReqUpiu != NULL);\r
   UfsInitQueryRequestUpiu (\r
     QueryReqUpiu,\r
@@ -640,11 +640,11 @@ UfsCreateDMCommandDesc (
   Trd->UcdBa  = (UINT32)RShiftU64 ((UINT64)CmdDescPhyAddr, 7);\r
   Trd->UcdBaU = (UINT32)RShiftU64 ((UINT64)CmdDescPhyAddr, 32);\r
   if (Opcode == UtpQueryFuncOpcodeWrDesc) {\r
-    Trd->RuL  = (UINT16)DivU64x32 ((UINT64)ROUNDUP8 (sizeof (UTP_QUERY_RESP_UPIU)), sizeof (UINT32));\r
-    Trd->RuO  = (UINT16)DivU64x32 ((UINT64)ROUNDUP8 (sizeof (UTP_QUERY_REQ_UPIU)) + ROUNDUP8 (DataSize), sizeof (UINT32));\r
+    Trd->RuL = (UINT16)DivU64x32 ((UINT64)ROUNDUP8 (sizeof (UTP_QUERY_RESP_UPIU)), sizeof (UINT32));\r
+    Trd->RuO = (UINT16)DivU64x32 ((UINT64)ROUNDUP8 (sizeof (UTP_QUERY_REQ_UPIU)) + ROUNDUP8 (DataSize), sizeof (UINT32));\r
   } else {\r
-    Trd->RuL  = (UINT16)DivU64x32 ((UINT64)ROUNDUP8 (sizeof (UTP_QUERY_RESP_UPIU)) + ROUNDUP8 (DataSize), sizeof (UINT32));\r
-    Trd->RuO  = (UINT16)DivU64x32 ((UINT64)ROUNDUP8 (sizeof (UTP_QUERY_REQ_UPIU)), sizeof (UINT32));\r
+    Trd->RuL = (UINT16)DivU64x32 ((UINT64)ROUNDUP8 (sizeof (UTP_QUERY_RESP_UPIU)) + ROUNDUP8 (DataSize), sizeof (UINT32));\r
+    Trd->RuO = (UINT16)DivU64x32 ((UINT64)ROUNDUP8 (sizeof (UTP_QUERY_REQ_UPIU)), sizeof (UINT32));\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -665,16 +665,16 @@ UfsCreateDMCommandDesc (
 **/\r
 EFI_STATUS\r
 UfsCreateNopCommandDesc (\r
-  IN     UFS_PASS_THRU_PRIVATE_DATA        *Private,\r
-  IN     UTP_TRD                           *Trd,\r
-     OUT VOID                              **CmdDescHost,\r
-     OUT VOID                              **CmdDescMapping\r
+  IN     UFS_PASS_THRU_PRIVATE_DATA  *Private,\r
+  IN     UTP_TRD                     *Trd,\r
+  OUT VOID                           **CmdDescHost,\r
+  OUT VOID                           **CmdDescMapping\r
   )\r
 {\r
-  UINTN                    TotalLen;\r
-  UTP_NOP_OUT_UPIU         *NopOutUpiu;\r
-  EFI_STATUS               Status;\r
-  EFI_PHYSICAL_ADDRESS     CmdDescPhyAddr;\r
+  UINTN                 TotalLen;\r
+  UTP_NOP_OUT_UPIU      *NopOutUpiu;\r
+  EFI_STATUS            Status;\r
+  EFI_PHYSICAL_ADDRESS  CmdDescPhyAddr;\r
 \r
   ASSERT ((Private != NULL) && (Trd != NULL));\r
 \r
@@ -684,7 +684,7 @@ UfsCreateNopCommandDesc (
     return Status;\r
   }\r
 \r
-  NopOutUpiu = (UTP_NOP_OUT_UPIU*)*CmdDescHost;\r
+  NopOutUpiu = (UTP_NOP_OUT_UPIU *)*CmdDescHost;\r
   ASSERT (NopOutUpiu != NULL);\r
   NopOutUpiu->TaskTag = Private->TaskTag++;\r
 \r
@@ -716,23 +716,23 @@ UfsCreateNopCommandDesc (
 **/\r
 EFI_STATUS\r
 UfsFindAvailableSlotInTrl (\r
-  IN     UFS_PASS_THRU_PRIVATE_DATA   *Private,\r
-     OUT UINT8                        *Slot\r
+  IN     UFS_PASS_THRU_PRIVATE_DATA  *Private,\r
+  OUT UINT8                          *Slot\r
   )\r
 {\r
-  UINT8            Nutrs;\r
-  UINT8            Index;\r
-  UINT32           Data;\r
-  EFI_STATUS       Status;\r
+  UINT8       Nutrs;\r
+  UINT8       Index;\r
+  UINT32      Data;\r
+  EFI_STATUS  Status;\r
 \r
   ASSERT ((Private != NULL) && (Slot != NULL));\r
 \r
-  Status  = UfsMmioRead32 (Private, UFS_HC_UTRLDBR_OFFSET, &Data);\r
+  Status = UfsMmioRead32 (Private, UFS_HC_UTRLDBR_OFFSET, &Data);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Nutrs   = (UINT8)((Private->UfsHcInfo.Capabilities & UFS_HC_CAP_NUTRS) + 1);\r
+  Nutrs = (UINT8)((Private->UfsHcInfo.Capabilities & UFS_HC_CAP_NUTRS) + 1);\r
 \r
   for (Index = 0; Index < Nutrs; Index++) {\r
     if ((Data & (BIT0 << Index)) == 0) {\r
@@ -744,7 +744,6 @@ UfsFindAvailableSlotInTrl (
   return EFI_NOT_READY;\r
 }\r
 \r
-\r
 /**\r
   Start specified slot in transfer list of a UFS device.\r
 \r
@@ -754,12 +753,12 @@ UfsFindAvailableSlotInTrl (
 **/\r
 EFI_STATUS\r
 UfsStartExecCmd (\r
-  IN  UFS_PASS_THRU_PRIVATE_DATA   *Private,\r
-  IN  UINT8                        Slot\r
+  IN  UFS_PASS_THRU_PRIVATE_DATA  *Private,\r
+  IN  UINT8                       Slot\r
   )\r
 {\r
-  UINT32        Data;\r
-  EFI_STATUS    Status;\r
+  UINT32      Data;\r
+  EFI_STATUS  Status;\r
 \r
   Status = UfsMmioRead32 (Private, UFS_HC_UTRLRSR_OFFSET, &Data);\r
   if (EFI_ERROR (Status)) {\r
@@ -790,12 +789,12 @@ UfsStartExecCmd (
 **/\r
 EFI_STATUS\r
 UfsStopExecCmd (\r
-  IN  UFS_PASS_THRU_PRIVATE_DATA   *Private,\r
-  IN  UINT8                        Slot\r
+  IN  UFS_PASS_THRU_PRIVATE_DATA  *Private,\r
+  IN  UINT8                       Slot\r
   )\r
 {\r
-  UINT32        Data;\r
-  EFI_STATUS    Status;\r
+  UINT32      Data;\r
+  EFI_STATUS  Status;\r
 \r
   Status = UfsMmioRead32 (Private, UFS_HC_UTRLDBR_OFFSET, &Data);\r
   if (EFI_ERROR (Status)) {\r
@@ -837,14 +836,14 @@ UfsGetReturnDataFromQueryResponse (
   UINT16  ReturnDataSize;\r
   UINT32  ReturnData;\r
 \r
-  if (Packet == NULL || QueryResp == NULL) {\r
+  if ((Packet == NULL) || (QueryResp == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   switch (Packet->Opcode) {\r
     case UtpQueryFuncOpcodeRdDesc:\r
       ReturnDataSize = QueryResp->Tsf.Length;\r
-      SwapLittleEndianToBigEndian ((UINT8*)&ReturnDataSize, sizeof (UINT16));\r
+      SwapLittleEndianToBigEndian ((UINT8 *)&ReturnDataSize, sizeof (UINT16));\r
       //\r
       // Make sure the hardware device does not return more data than expected.\r
       //\r
@@ -857,7 +856,7 @@ UfsGetReturnDataFromQueryResponse (
       break;\r
     case UtpQueryFuncOpcodeWrDesc:\r
       ReturnDataSize = QueryResp->Tsf.Length;\r
-      SwapLittleEndianToBigEndian ((UINT8*)&ReturnDataSize, sizeof (UINT16));\r
+      SwapLittleEndianToBigEndian ((UINT8 *)&ReturnDataSize, sizeof (UINT16));\r
       Packet->TransferLength = ReturnDataSize;\r
       break;\r
     case UtpQueryFuncOpcodeRdFlag:\r
@@ -867,12 +866,12 @@ UfsGetReturnDataFromQueryResponse (
       //\r
       // The 'FLAG VALUE' field is at byte offset 3 of QueryResp->Tsf.Value\r
       //\r
-      *((UINT8*)(Packet->DataBuffer)) = *((UINT8*)&(QueryResp->Tsf.Value) + 3);\r
+      *((UINT8 *)(Packet->DataBuffer)) = *((UINT8 *)&(QueryResp->Tsf.Value) + 3);\r
       break;\r
     case UtpQueryFuncOpcodeRdAttr:\r
     case UtpQueryFuncOpcodeWrAttr:\r
       ReturnData = QueryResp->Tsf.Value;\r
-      SwapLittleEndianToBigEndian ((UINT8*) &ReturnData, sizeof (UINT32));\r
+      SwapLittleEndianToBigEndian ((UINT8 *)&ReturnData, sizeof (UINT32));\r
       CopyMem (Packet->DataBuffer, &ReturnData, sizeof (UINT32));\r
       break;\r
     default:\r
@@ -918,7 +917,7 @@ UfsSendDmRequestRetry (
     return Status;\r
   }\r
 \r
-  Trd = ((UTP_TRD*)Private->UtpTrlBase) + Slot;\r
+  Trd = ((UTP_TRD *)Private->UtpTrlBase) + Slot;\r
   //\r
   // Fill transfer request descriptor to this slot.\r
   //\r
@@ -928,8 +927,8 @@ UfsSendDmRequestRetry (
     return Status;\r
   }\r
 \r
-  UfsHc       = Private->UfsHostController;\r
-  QueryResp   = (UTP_QUERY_RESP_UPIU*)((UINT8*)CmdDescHost + Trd->RuO * sizeof (UINT32));\r
+  UfsHc     = Private->UfsHostController;\r
+  QueryResp = (UTP_QUERY_RESP_UPIU *)((UINT8 *)CmdDescHost + Trd->RuO * sizeof (UINT32));\r
   ASSERT (QueryResp != NULL);\r
   CmdDescSize = Trd->RuO * sizeof (UINT32) + Trd->RuL * sizeof (UINT32);\r
 \r
@@ -946,17 +945,19 @@ UfsSendDmRequestRetry (
     goto Exit;\r
   }\r
 \r
-  if (Trd->Ocs != 0 || QueryResp->QueryResp != UfsUtpQueryResponseSuccess) {\r
+  if ((Trd->Ocs != 0) || (QueryResp->QueryResp != UfsUtpQueryResponseSuccess)) {\r
     DEBUG ((DEBUG_ERROR, "Failed to send query request, OCS = %X, QueryResp = %X\n", Trd->Ocs, QueryResp->QueryResp));\r
     DumpQueryResponseResult (QueryResp->QueryResp);\r
 \r
     if ((QueryResp->QueryResp == UfsUtpQueryResponseInvalidSelector) ||\r
         (QueryResp->QueryResp == UfsUtpQueryResponseInvalidIndex) ||\r
-        (QueryResp->QueryResp == UfsUtpQueryResponseInvalidIdn)) {\r
+        (QueryResp->QueryResp == UfsUtpQueryResponseInvalidIdn))\r
+    {\r
       Status = EFI_INVALID_PARAMETER;\r
     } else {\r
       Status = EFI_DEVICE_ERROR;\r
     }\r
+\r
     goto Exit;\r
   }\r
 \r
@@ -974,6 +975,7 @@ Exit:
   if (CmdDescMapping != NULL) {\r
     UfsHc->Unmap (UfsHc, CmdDescMapping);\r
   }\r
+\r
   if (CmdDescHost != NULL) {\r
     UfsHc->FreeBuffer (UfsHc, EFI_SIZE_TO_PAGES (CmdDescSize), CmdDescHost);\r
   }\r
@@ -1005,7 +1007,7 @@ UfsSendDmRequest (
 \r
   Status = EFI_SUCCESS;\r
 \r
-  for (Retry = 0; Retry < 5; Retry ++) {\r
+  for (Retry = 0; Retry < 5; Retry++) {\r
     Status = UfsSendDmRequestRetry (Private, Packet);\r
     if (!EFI_ERROR (Status)) {\r
       return EFI_SUCCESS;\r
@@ -1038,17 +1040,17 @@ UfsSendDmRequest (
 **/\r
 EFI_STATUS\r
 UfsRwDeviceDesc (\r
-  IN     UFS_PASS_THRU_PRIVATE_DATA   *Private,\r
-  IN     BOOLEAN                      Read,\r
-  IN     UINT8                        DescId,\r
-  IN     UINT8                        Index,\r
-  IN     UINT8                        Selector,\r
-  IN OUT VOID                         *Descriptor,\r
-  IN OUT UINT32                       *DescSize\r
+  IN     UFS_PASS_THRU_PRIVATE_DATA  *Private,\r
+  IN     BOOLEAN                     Read,\r
+  IN     UINT8                       DescId,\r
+  IN     UINT8                       Index,\r
+  IN     UINT8                       Selector,\r
+  IN OUT VOID                        *Descriptor,\r
+  IN OUT UINT32                      *DescSize\r
   )\r
 {\r
-  UFS_DEVICE_MANAGEMENT_REQUEST_PACKET Packet;\r
-  EFI_STATUS                           Status;\r
+  UFS_DEVICE_MANAGEMENT_REQUEST_PACKET  Packet;\r
+  EFI_STATUS                            Status;\r
 \r
   if (DescSize == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1057,18 +1059,19 @@ UfsRwDeviceDesc (
   ZeroMem (&Packet, sizeof (UFS_DEVICE_MANAGEMENT_REQUEST_PACKET));\r
 \r
   if (Read) {\r
-    Packet.DataDirection     = UfsDataIn;\r
-    Packet.Opcode            = UtpQueryFuncOpcodeRdDesc;\r
+    Packet.DataDirection = UfsDataIn;\r
+    Packet.Opcode        = UtpQueryFuncOpcodeRdDesc;\r
   } else {\r
-    Packet.DataDirection     = UfsDataOut;\r
-    Packet.Opcode            = UtpQueryFuncOpcodeWrDesc;\r
+    Packet.DataDirection = UfsDataOut;\r
+    Packet.Opcode        = UtpQueryFuncOpcodeWrDesc;\r
   }\r
-  Packet.DataBuffer          = Descriptor;\r
-  Packet.TransferLength      = *DescSize;\r
-  Packet.DescId              = DescId;\r
-  Packet.Index               = Index;\r
-  Packet.Selector            = Selector;\r
-  Packet.Timeout             = UFS_TIMEOUT;\r
+\r
+  Packet.DataBuffer     = Descriptor;\r
+  Packet.TransferLength = *DescSize;\r
+  Packet.DescId         = DescId;\r
+  Packet.Index          = Index;\r
+  Packet.Selector       = Selector;\r
+  Packet.Timeout        = UFS_TIMEOUT;\r
 \r
   Status = UfsSendDmRequest (Private, &Packet);\r
   if (EFI_ERROR (Status)) {\r
@@ -1099,30 +1102,31 @@ UfsRwDeviceDesc (
 **/\r
 EFI_STATUS\r
 UfsRwAttributes (\r
-  IN     UFS_PASS_THRU_PRIVATE_DATA   *Private,\r
-  IN     BOOLEAN                      Read,\r
-  IN     UINT8                        AttrId,\r
-  IN     UINT8                        Index,\r
-  IN     UINT8                        Selector,\r
-  IN OUT UINT32                       *Attributes\r
+  IN     UFS_PASS_THRU_PRIVATE_DATA  *Private,\r
+  IN     BOOLEAN                     Read,\r
+  IN     UINT8                       AttrId,\r
+  IN     UINT8                       Index,\r
+  IN     UINT8                       Selector,\r
+  IN OUT UINT32                      *Attributes\r
   )\r
 {\r
-  UFS_DEVICE_MANAGEMENT_REQUEST_PACKET Packet;\r
+  UFS_DEVICE_MANAGEMENT_REQUEST_PACKET  Packet;\r
 \r
   ZeroMem (&Packet, sizeof (UFS_DEVICE_MANAGEMENT_REQUEST_PACKET));\r
 \r
   if (Read) {\r
-    Packet.DataDirection     = UfsDataIn;\r
-    Packet.Opcode            = UtpQueryFuncOpcodeRdAttr;\r
+    Packet.DataDirection = UfsDataIn;\r
+    Packet.Opcode        = UtpQueryFuncOpcodeRdAttr;\r
   } else {\r
-    Packet.DataDirection     = UfsDataOut;\r
-    Packet.Opcode            = UtpQueryFuncOpcodeWrAttr;\r
+    Packet.DataDirection = UfsDataOut;\r
+    Packet.Opcode        = UtpQueryFuncOpcodeWrAttr;\r
   }\r
-  Packet.DataBuffer          = Attributes;\r
-  Packet.DescId              = AttrId;\r
-  Packet.Index               = Index;\r
-  Packet.Selector            = Selector;\r
-  Packet.Timeout             = UFS_TIMEOUT;\r
+\r
+  Packet.DataBuffer = Attributes;\r
+  Packet.DescId     = AttrId;\r
+  Packet.Index      = Index;\r
+  Packet.Selector   = Selector;\r
+  Packet.Timeout    = UFS_TIMEOUT;\r
 \r
   return UfsSendDmRequest (Private, &Packet);\r
 }\r
@@ -1143,13 +1147,13 @@ UfsRwAttributes (
 **/\r
 EFI_STATUS\r
 UfsRwFlags (\r
-  IN     UFS_PASS_THRU_PRIVATE_DATA   *Private,\r
-  IN     BOOLEAN                      Read,\r
-  IN     UINT8                        FlagId,\r
-  IN OUT UINT8                        *Value\r
+  IN     UFS_PASS_THRU_PRIVATE_DATA  *Private,\r
+  IN     BOOLEAN                     Read,\r
+  IN     UINT8                       FlagId,\r
+  IN OUT UINT8                       *Value\r
   )\r
 {\r
-  UFS_DEVICE_MANAGEMENT_REQUEST_PACKET Packet;\r
+  UFS_DEVICE_MANAGEMENT_REQUEST_PACKET  Packet;\r
 \r
   if (Value == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1159,23 +1163,24 @@ UfsRwFlags (
 \r
   if (Read) {\r
     ASSERT (Value != NULL);\r
-    Packet.DataDirection     = UfsDataIn;\r
-    Packet.Opcode            = UtpQueryFuncOpcodeRdFlag;\r
+    Packet.DataDirection = UfsDataIn;\r
+    Packet.Opcode        = UtpQueryFuncOpcodeRdFlag;\r
   } else {\r
-    Packet.DataDirection     = UfsDataOut;\r
+    Packet.DataDirection = UfsDataOut;\r
     if (*Value == 1) {\r
-      Packet.Opcode          = UtpQueryFuncOpcodeSetFlag;\r
+      Packet.Opcode = UtpQueryFuncOpcodeSetFlag;\r
     } else if (*Value == 0) {\r
-      Packet.Opcode          = UtpQueryFuncOpcodeClrFlag;\r
+      Packet.Opcode = UtpQueryFuncOpcodeClrFlag;\r
     } else {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
-  Packet.DataBuffer          = Value;\r
-  Packet.DescId              = FlagId;\r
-  Packet.Index               = 0;\r
-  Packet.Selector            = 0;\r
-  Packet.Timeout             = UFS_TIMEOUT;\r
+\r
+  Packet.DataBuffer = Value;\r
+  Packet.DescId     = FlagId;\r
+  Packet.Index      = 0;\r
+  Packet.Selector   = 0;\r
+  Packet.Timeout    = UFS_TIMEOUT;\r
 \r
   return UfsSendDmRequest (Private, &Packet);\r
 }\r
@@ -1193,12 +1198,12 @@ UfsRwFlags (
 **/\r
 EFI_STATUS\r
 UfsSetFlag (\r
-  IN  UFS_PASS_THRU_PRIVATE_DATA   *Private,\r
-  IN  UINT8                        FlagId\r
+  IN  UFS_PASS_THRU_PRIVATE_DATA  *Private,\r
+  IN  UINT8                       FlagId\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
-  UINT8                  Value;\r
+  EFI_STATUS  Status;\r
+  UINT8       Value;\r
 \r
   Value  = 1;\r
   Status = UfsRwFlags (Private, FALSE, FlagId, &Value);\r
@@ -1220,12 +1225,12 @@ UfsSetFlag (
 **/\r
 EFI_STATUS\r
 UfsReadFlag (\r
-  IN     UFS_PASS_THRU_PRIVATE_DATA   *Private,\r
-  IN     UINT8                        FlagId,\r
-     OUT UINT8                        *Value\r
+  IN     UFS_PASS_THRU_PRIVATE_DATA  *Private,\r
+  IN     UINT8                       FlagId,\r
+  OUT UINT8                          *Value\r
   )\r
 {\r
-  EFI_STATUS                           Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = UfsRwFlags (Private, TRUE, FlagId, Value);\r
 \r
@@ -1247,17 +1252,17 @@ UfsReadFlag (
 **/\r
 EFI_STATUS\r
 UfsExecNopCmds (\r
-  IN  UFS_PASS_THRU_PRIVATE_DATA       *Private\r
+  IN  UFS_PASS_THRU_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_STATUS                           Status;\r
-  UINT8                                Slot;\r
-  UTP_TRD                              *Trd;\r
-  UTP_NOP_IN_UPIU                      *NopInUpiu;\r
-  UINT32                               CmdDescSize;\r
-  VOID                                 *CmdDescHost;\r
-  VOID                                 *CmdDescMapping;\r
-  EDKII_UFS_HOST_CONTROLLER_PROTOCOL   *UfsHc;\r
+  EFI_STATUS                          Status;\r
+  UINT8                               Slot;\r
+  UTP_TRD                             *Trd;\r
+  UTP_NOP_IN_UPIU                     *NopInUpiu;\r
+  UINT32                              CmdDescSize;\r
+  VOID                                *CmdDescHost;\r
+  VOID                                *CmdDescMapping;\r
+  EDKII_UFS_HOST_CONTROLLER_PROTOCOL  *UfsHc;\r
 \r
   //\r
   // Find out which slot of transfer request list is available.\r
@@ -1267,7 +1272,7 @@ UfsExecNopCmds (
     return Status;\r
   }\r
 \r
-  Trd    = ((UTP_TRD*)Private->UtpTrlBase) + Slot;\r
+  Trd    = ((UTP_TRD *)Private->UtpTrlBase) + Slot;\r
   Status = UfsCreateNopCommandDesc (Private, Trd, &CmdDescHost, &CmdDescMapping);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -1276,8 +1281,8 @@ UfsExecNopCmds (
   //\r
   // Check the transfer request result.\r
   //\r
-  UfsHc       = Private->UfsHostController;\r
-  NopInUpiu   = (UTP_NOP_IN_UPIU*)((UINT8*)CmdDescHost + Trd->RuO * sizeof (UINT32));\r
+  UfsHc     = Private->UfsHostController;\r
+  NopInUpiu = (UTP_NOP_IN_UPIU *)((UINT8 *)CmdDescHost + Trd->RuO * sizeof (UINT32));\r
   ASSERT (NopInUpiu != NULL);\r
   CmdDescSize = Trd->RuO * sizeof (UINT32) + Trd->RuL * sizeof (UINT32);\r
 \r
@@ -1308,6 +1313,7 @@ Exit:
   if (CmdDescMapping != NULL) {\r
     UfsHc->Unmap (UfsHc, CmdDescMapping);\r
   }\r
+\r
   if (CmdDescHost != NULL) {\r
     UfsHc->FreeBuffer (UfsHc, EFI_SIZE_TO_PAGES (CmdDescSize), CmdDescHost);\r
   }\r
@@ -1346,6 +1352,7 @@ UfsReconcileDataTransferBuffer (
     if (TransReq->Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_READ) {\r
       CopyMem (TransReq->Packet->InDataBuffer, TransReq->AlignedDataBuf, TransReq->Packet->InTransferLength);\r
     }\r
+\r
     //\r
     // Wipe out the transfer buffer in case it contains sensitive data.\r
     //\r
@@ -1393,14 +1400,16 @@ UfsPrepareDataTransferBuffer (
       if (DataBuf == NULL) {\r
         return EFI_DEVICE_ERROR;\r
       }\r
+\r
       ZeroMem (DataBuf, DataLen);\r
-      TransReq->AlignedDataBuf = DataBuf;\r
+      TransReq->AlignedDataBuf     = DataBuf;\r
       TransReq->AlignedDataBufSize = DataLen;\r
     } else {\r
-      DataLen       = TransReq->Packet->InTransferLength;\r
-      DataBuf       = TransReq->Packet->InDataBuffer;\r
+      DataLen = TransReq->Packet->InTransferLength;\r
+      DataBuf = TransReq->Packet->InDataBuffer;\r
     }\r
-    Flag          = EdkiiUfsHcOperationBusMasterWrite;\r
+\r
+    Flag = EdkiiUfsHcOperationBusMasterWrite;\r
   } else {\r
     if (((UINTN)TransReq->Packet->OutDataBuffer % 4 != 0) || (TransReq->Packet->OutTransferLength % 4 != 0)) {\r
       DataLen = TransReq->Packet->OutTransferLength + (4 - (TransReq->Packet->OutTransferLength % 4));\r
@@ -1408,14 +1417,16 @@ UfsPrepareDataTransferBuffer (
       if (DataBuf == NULL) {\r
         return EFI_DEVICE_ERROR;\r
       }\r
+\r
       CopyMem (DataBuf, TransReq->Packet->OutDataBuffer, TransReq->Packet->OutTransferLength);\r
-      TransReq->AlignedDataBuf = DataBuf;\r
+      TransReq->AlignedDataBuf     = DataBuf;\r
       TransReq->AlignedDataBufSize = DataLen;\r
     } else {\r
-      DataLen       = TransReq->Packet->OutTransferLength;\r
-      DataBuf       = TransReq->Packet->OutDataBuffer;\r
+      DataLen = TransReq->Packet->OutTransferLength;\r
+      DataBuf = TransReq->Packet->OutDataBuffer;\r
     }\r
-    Flag          = EdkiiUfsHcOperationBusMasterRead;\r
+\r
+    Flag = EdkiiUfsHcOperationBusMasterRead;\r
   }\r
 \r
   if (DataLen != 0) {\r
@@ -1438,6 +1449,7 @@ UfsPrepareDataTransferBuffer (
         FreeAlignedPages (TransReq->AlignedDataBuf, EFI_SIZE_TO_PAGES (TransReq->AlignedDataBufSize));\r
         TransReq->AlignedDataBuf = NULL;\r
       }\r
+\r
       return EFI_DEVICE_ERROR;\r
     }\r
   }\r
@@ -1445,9 +1457,9 @@ UfsPrepareDataTransferBuffer (
   //\r
   // Fill PRDT table of Command UPIU for executed SCSI cmd.\r
   //\r
-  PrdtBase = (UTP_TR_PRD*)((UINT8*)TransReq->CmdDescHost + ROUNDUP8 (sizeof (UTP_COMMAND_UPIU)) + ROUNDUP8 (sizeof (UTP_RESPONSE_UPIU)));\r
+  PrdtBase = (UTP_TR_PRD *)((UINT8 *)TransReq->CmdDescHost + ROUNDUP8 (sizeof (UTP_COMMAND_UPIU)) + ROUNDUP8 (sizeof (UTP_RESPONSE_UPIU)));\r
   ASSERT (PrdtBase != NULL);\r
-  UfsInitUtpPrdt (PrdtBase, (VOID*)(UINTN)DataBufPhyAddr, DataLen);\r
+  UfsInitUtpPrdt (PrdtBase, (VOID *)(UINTN)DataBufPhyAddr, DataLen);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -1484,13 +1496,13 @@ UfsExecScsiCmds (
   IN     EFI_EVENT                                   Event    OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                           Status;\r
-  UTP_RESPONSE_UPIU                    *Response;\r
-  UINT16                               SenseDataLen;\r
-  UINT32                               ResTranCount;\r
-  EFI_TPL                              OldTpl;\r
-  UFS_PASS_THRU_TRANS_REQ              *TransReq;\r
-  EDKII_UFS_HOST_CONTROLLER_PROTOCOL   *UfsHc;\r
+  EFI_STATUS                          Status;\r
+  UTP_RESPONSE_UPIU                   *Response;\r
+  UINT16                              SenseDataLen;\r
+  UINT32                              ResTranCount;\r
+  EFI_TPL                             OldTpl;\r
+  UFS_PASS_THRU_TRANS_REQ             *TransReq;\r
+  EDKII_UFS_HOST_CONTROLLER_PROTOCOL  *UfsHc;\r
 \r
   TransReq = AllocateZeroPool (sizeof (UFS_PASS_THRU_TRANS_REQ));\r
   if (TransReq == NULL) {\r
@@ -1501,7 +1513,7 @@ UfsExecScsiCmds (
   TransReq->TimeoutRemain = Packet->Timeout;\r
   TransReq->Packet        = Packet;\r
 \r
-  UfsHc          = Private->UfsHostController;\r
+  UfsHc = Private->UfsHostController;\r
   //\r
   // Find out which slot of transfer request list is available.\r
   //\r
@@ -1510,7 +1522,7 @@ UfsExecScsiCmds (
     return Status;\r
   }\r
 \r
-  TransReq->Trd = ((UTP_TRD*)Private->UtpTrlBase) + TransReq->Slot;\r
+  TransReq->Trd = ((UTP_TRD *)Private->UtpTrlBase) + TransReq->Slot;\r
 \r
   //\r
   // Fill transfer request descriptor to this slot.\r
@@ -1538,7 +1550,7 @@ UfsExecScsiCmds (
   // Insert the async SCSI cmd to the Async I/O list\r
   //\r
   if (Event != NULL) {\r
-    OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
+    OldTpl                = gBS->RaiseTPL (TPL_NOTIFY);\r
     TransReq->CallerEvent = Event;\r
     InsertTailList (&Private->Queue, &TransReq->TransferList);\r
     gBS->RestoreTPL (OldTpl);\r
@@ -1567,10 +1579,10 @@ UfsExecScsiCmds (
   //\r
   // Get sense data if exists\r
   //\r
-  Response     = (UTP_RESPONSE_UPIU*)((UINT8*)TransReq->CmdDescHost + TransReq->Trd->RuO * sizeof (UINT32));\r
+  Response = (UTP_RESPONSE_UPIU *)((UINT8 *)TransReq->CmdDescHost + TransReq->Trd->RuO * sizeof (UINT32));\r
   ASSERT (Response != NULL);\r
   SenseDataLen = Response->SenseDataLen;\r
-  SwapLittleEndianToBigEndian ((UINT8*)&SenseDataLen, sizeof (UINT16));\r
+  SwapLittleEndianToBigEndian ((UINT8 *)&SenseDataLen, sizeof (UINT16));\r
 \r
   if ((Packet->SenseDataLength != 0) && (Packet->SenseData != NULL)) {\r
     //\r
@@ -1598,13 +1610,13 @@ UfsExecScsiCmds (
     if (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_READ) {\r
       if ((Response->Flags & BIT5) == BIT5) {\r
         ResTranCount = Response->ResTranCount;\r
-        SwapLittleEndianToBigEndian ((UINT8*)&ResTranCount, sizeof (UINT32));\r
+        SwapLittleEndianToBigEndian ((UINT8 *)&ResTranCount, sizeof (UINT32));\r
         Packet->InTransferLength -= ResTranCount;\r
       }\r
     } else {\r
       if ((Response->Flags & BIT5) == BIT5) {\r
         ResTranCount = Response->ResTranCount;\r
-        SwapLittleEndianToBigEndian ((UINT8*)&ResTranCount, sizeof (UINT32));\r
+        SwapLittleEndianToBigEndian ((UINT8 *)&ResTranCount, sizeof (UINT32));\r
         Packet->OutTransferLength -= ResTranCount;\r
       }\r
     }\r
@@ -1623,12 +1635,15 @@ Exit1:
   if (TransReq->CmdDescMapping != NULL) {\r
     UfsHc->Unmap (UfsHc, TransReq->CmdDescMapping);\r
   }\r
+\r
   if (TransReq->CmdDescHost != NULL) {\r
     UfsHc->FreeBuffer (UfsHc, EFI_SIZE_TO_PAGES (TransReq->CmdDescSize), TransReq->CmdDescHost);\r
   }\r
+\r
   if (TransReq != NULL) {\r
     FreePool (TransReq);\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -1644,8 +1659,8 @@ Exit1:
 **/\r
 EFI_STATUS\r
 UfsExecUicCommands (\r
-  IN  UFS_PASS_THRU_PRIVATE_DATA    *Private,\r
-  IN OUT EDKII_UIC_COMMAND          *UicCommand\r
+  IN  UFS_PASS_THRU_PRIVATE_DATA  *Private,\r
+  IN OUT EDKII_UIC_COMMAND        *UicCommand\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -1703,7 +1718,7 @@ UfsExecUicCommands (
   // UFS 2.0 spec section 5.3.1 Offset:0x20 IS.Bit10 UIC Command Completion Status (UCCS)\r
   // This bit is set to '1' by the host controller upon completion of a UIC command.\r
   //\r
-  Status  = UfsWaitMemSet (Private, UFS_HC_IS_OFFSET, UFS_HC_IS_UCCS, UFS_HC_IS_UCCS, UFS_TIMEOUT);\r
+  Status = UfsWaitMemSet (Private, UFS_HC_IS_OFFSET, UFS_HC_IS_UCCS, UFS_HC_IS_UCCS, UFS_TIMEOUT);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -1713,14 +1728,16 @@ UfsExecUicCommands (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     Status = UfsMmioRead32 (Private, UFS_HC_UCMD_ARG3_OFFSET, &UicCommand->Arg3);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     if ((UicCommand->Arg2 & 0xFF) != 0) {\r
-      DEBUG_CODE_BEGIN();\r
-        DumpUicCmdExecResult ((UINT8)UicCommand->Opcode, (UINT8)(UicCommand->Arg2 & 0xFF));\r
-      DEBUG_CODE_END();\r
+      DEBUG_CODE_BEGIN ();\r
+      DumpUicCmdExecResult ((UINT8)UicCommand->Opcode, (UINT8)(UicCommand->Arg2 & 0xFF));\r
+      DEBUG_CODE_END ();\r
       return EFI_DEVICE_ERROR;\r
     }\r
   }\r
@@ -1744,17 +1761,17 @@ UfsExecUicCommands (
 **/\r
 EFI_STATUS\r
 UfsAllocateAlignCommonBuffer (\r
-  IN     UFS_PASS_THRU_PRIVATE_DATA    *Private,\r
-  IN     UINTN                         Size,\r
-     OUT VOID                          **CmdDescHost,\r
-     OUT EFI_PHYSICAL_ADDRESS          *CmdDescPhyAddr,\r
-     OUT VOID                          **CmdDescMapping\r
+  IN     UFS_PASS_THRU_PRIVATE_DATA  *Private,\r
+  IN     UINTN                       Size,\r
+  OUT VOID                           **CmdDescHost,\r
+  OUT EFI_PHYSICAL_ADDRESS           *CmdDescPhyAddr,\r
+  OUT VOID                           **CmdDescMapping\r
   )\r
 {\r
-  EFI_STATUS                           Status;\r
-  UINTN                                Bytes;\r
-  BOOLEAN                              Is32BitAddr;\r
-  EDKII_UFS_HOST_CONTROLLER_PROTOCOL   *UfsHc;\r
+  EFI_STATUS                          Status;\r
+  UINTN                               Bytes;\r
+  BOOLEAN                             Is32BitAddr;\r
+  EDKII_UFS_HOST_CONTROLLER_PROTOCOL  *UfsHc;\r
 \r
   if ((Private->UfsHcInfo.Capabilities & UFS_HC_CAP_64ADDR) == UFS_HC_CAP_64ADDR) {\r
     Is32BitAddr = FALSE;\r
@@ -1831,13 +1848,13 @@ UfsAllocateAlignCommonBuffer (
 **/\r
 EFI_STATUS\r
 UfsEnableHostController (\r
-  IN  UFS_PASS_THRU_PRIVATE_DATA     *Private\r
+  IN  UFS_PASS_THRU_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
-  UINT32                 Data;\r
+  EFI_STATUS  Status;\r
+  UINT32      Data;\r
 \r
-  if (mUfsHcPlatform != NULL && mUfsHcPlatform->Callback != NULL) {\r
+  if ((mUfsHcPlatform != NULL) && (mUfsHcPlatform->Callback != NULL)) {\r
     Status = mUfsHcPlatform->Callback (Private->Handle, EdkiiUfsHcPreHce, &Private->UfsHcDriverInterface);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "Failure from platform driver during EdkiiUfsHcPreHce, Status = %r\n", Status));\r
@@ -1863,6 +1880,7 @@ UfsEnableHostController (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     //\r
     // Wait until HCE is read as '0' before continuing.\r
     //\r
@@ -1888,7 +1906,7 @@ UfsEnableHostController (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  if (mUfsHcPlatform != NULL && mUfsHcPlatform->Callback != NULL) {\r
+  if ((mUfsHcPlatform != NULL) && (mUfsHcPlatform->Callback != NULL)) {\r
     Status = mUfsHcPlatform->Callback (Private->Handle, EdkiiUfsHcPostHce, &Private->UfsHcDriverInterface);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "Failure from platform driver during EdkiiUfsHcPostHce, Status = %r\n", Status));\r
@@ -1911,7 +1929,7 @@ UfsEnableHostController (
 **/\r
 EFI_STATUS\r
 UfsDeviceDetection (\r
-  IN  UFS_PASS_THRU_PRIVATE_DATA     *Private\r
+  IN  UFS_PASS_THRU_PRIVATE_DATA  *Private\r
   )\r
 {\r
   UINTN              Retry;\r
@@ -1919,7 +1937,7 @@ UfsDeviceDetection (
   UINT32             Data;\r
   EDKII_UIC_COMMAND  LinkStartupCommand;\r
 \r
-  if (mUfsHcPlatform != NULL && mUfsHcPlatform->Callback != NULL) {\r
+  if ((mUfsHcPlatform != NULL) && (mUfsHcPlatform->Callback != NULL)) {\r
     Status = mUfsHcPlatform->Callback (Private->Handle, EdkiiUfsHcPreLinkStartup, &Private->UfsHcDriverInterface);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "Failure from platform driver during EdkiiUfsHcPreLinkStartup, Status = %r\n", Status));\r
@@ -1933,10 +1951,10 @@ UfsDeviceDetection (
   //\r
   for (Retry = 0; Retry < 3; Retry++) {\r
     LinkStartupCommand.Opcode = UfsUicDmeLinkStartup;\r
-    LinkStartupCommand.Arg1 = 0;\r
-    LinkStartupCommand.Arg2 = 0;\r
-    LinkStartupCommand.Arg3 = 0;\r
-    Status = UfsExecUicCommands (Private, &LinkStartupCommand);\r
+    LinkStartupCommand.Arg1   = 0;\r
+    LinkStartupCommand.Arg2   = 0;\r
+    LinkStartupCommand.Arg3   = 0;\r
+    Status                    = UfsExecUicCommands (Private, &LinkStartupCommand);\r
     if (EFI_ERROR (Status)) {\r
       return EFI_DEVICE_ERROR;\r
     }\r
@@ -1952,13 +1970,14 @@ UfsDeviceDetection (
         return EFI_DEVICE_ERROR;\r
       }\r
     } else {\r
-      if (mUfsHcPlatform != NULL && mUfsHcPlatform->Callback != NULL) {\r
+      if ((mUfsHcPlatform != NULL) && (mUfsHcPlatform->Callback != NULL)) {\r
         Status = mUfsHcPlatform->Callback (Private->Handle, EdkiiUfsHcPostLinkStartup, &Private->UfsHcDriverInterface);\r
         if (EFI_ERROR (Status)) {\r
           DEBUG ((DEBUG_ERROR, "Failure from platform driver during EdkiiUfsHcPostLinkStartup, Status = %r\n", Status));\r
           return Status;\r
         }\r
       }\r
+\r
       return EFI_SUCCESS;\r
     }\r
   }\r
@@ -1977,14 +1996,14 @@ UfsDeviceDetection (
 **/\r
 EFI_STATUS\r
 UfsInitTaskManagementRequestList (\r
-  IN  UFS_PASS_THRU_PRIVATE_DATA     *Private\r
+  IN  UFS_PASS_THRU_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  UINT8                  Nutmrs;\r
-  VOID                   *CmdDescHost;\r
-  EFI_PHYSICAL_ADDRESS   CmdDescPhyAddr;\r
-  VOID                   *CmdDescMapping;\r
-  EFI_STATUS             Status;\r
+  UINT8                 Nutmrs;\r
+  VOID                  *CmdDescHost;\r
+  EFI_PHYSICAL_ADDRESS  CmdDescPhyAddr;\r
+  VOID                  *CmdDescMapping;\r
+  EFI_STATUS            Status;\r
 \r
   //\r
   // Initial h/w and s/w context for future operations.\r
@@ -1996,7 +2015,7 @@ UfsInitTaskManagementRequestList (
   //\r
   // Allocate and initialize UTP Task Management Request List.\r
   //\r
-  Nutmrs = (UINT8) (RShiftU64 ((Private->UfsHcInfo.Capabilities & UFS_HC_CAP_NUTMRS), 16) + 1);\r
+  Nutmrs = (UINT8)(RShiftU64 ((Private->UfsHcInfo.Capabilities & UFS_HC_CAP_NUTMRS), 16) + 1);\r
   Status = UfsAllocateAlignCommonBuffer (Private, Nutmrs * sizeof (UTP_TMRD), &CmdDescHost, &CmdDescPhyAddr, &CmdDescMapping);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -2015,6 +2034,7 @@ UfsInitTaskManagementRequestList (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   Private->UtpTmrlBase = CmdDescHost;\r
   Private->Nutmrs      = Nutmrs;\r
   Private->TmrlMapping = CmdDescMapping;\r
@@ -2042,14 +2062,14 @@ UfsInitTaskManagementRequestList (
 **/\r
 EFI_STATUS\r
 UfsInitTransferRequestList (\r
-  IN  UFS_PASS_THRU_PRIVATE_DATA     *Private\r
+  IN  UFS_PASS_THRU_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  UINT8                  Nutrs;\r
-  VOID                   *CmdDescHost;\r
-  EFI_PHYSICAL_ADDRESS   CmdDescPhyAddr;\r
-  VOID                   *CmdDescMapping;\r
-  EFI_STATUS             Status;\r
+  UINT8                 Nutrs;\r
+  VOID                  *CmdDescHost;\r
+  EFI_PHYSICAL_ADDRESS  CmdDescPhyAddr;\r
+  VOID                  *CmdDescMapping;\r
+  EFI_STATUS            Status;\r
 \r
   //\r
   // Initial h/w and s/w context for future operations.\r
@@ -2108,10 +2128,10 @@ UfsInitTransferRequestList (
 **/\r
 EFI_STATUS\r
 UfsControllerInit (\r
-  IN  UFS_PASS_THRU_PRIVATE_DATA     *Private\r
+  IN  UFS_PASS_THRU_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = UfsEnableHostController (Private);\r
   if (EFI_ERROR (Status)) {\r
@@ -2152,11 +2172,11 @@ UfsControllerInit (
 **/\r
 EFI_STATUS\r
 UfsControllerStop (\r
-  IN  UFS_PASS_THRU_PRIVATE_DATA     *Private\r
+  IN  UFS_PASS_THRU_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
-  UINT32                 Data;\r
+  EFI_STATUS  Status;\r
+  UINT32      Data;\r
 \r
   //\r
   // Enable the UTP Task Management Request List by setting the UTP Task Management\r
@@ -2183,6 +2203,7 @@ UfsControllerStop (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   ASSERT ((Data & UFS_HC_HCE_EN) == UFS_HC_HCE_EN);\r
 \r
   Status = UfsMmioWrite32 (Private, UFS_HC_ENABLE_OFFSET, 0);\r
@@ -2216,17 +2237,17 @@ UfsControllerStop (
 VOID\r
 EFIAPI\r
 SignalCallerEvent (\r
-  IN UFS_PASS_THRU_PRIVATE_DATA      *Private,\r
-  IN UFS_PASS_THRU_TRANS_REQ         *TransReq\r
+  IN UFS_PASS_THRU_PRIVATE_DATA  *Private,\r
+  IN UFS_PASS_THRU_TRANS_REQ     *TransReq\r
   )\r
 {\r
-  EDKII_UFS_HOST_CONTROLLER_PROTOCOL *UfsHc;\r
-  EFI_EVENT                          CallerEvent;\r
+  EDKII_UFS_HOST_CONTROLLER_PROTOCOL  *UfsHc;\r
+  EFI_EVENT                           CallerEvent;\r
 \r
   ASSERT ((Private != NULL) && (TransReq != NULL));\r
 \r
-  UfsHc        = Private->UfsHostController;\r
-  CallerEvent  = TransReq->CallerEvent;\r
+  UfsHc       = Private->UfsHostController;\r
+  CallerEvent = TransReq->CallerEvent;\r
 \r
   RemoveEntryList (&TransReq->TransferList);\r
 \r
@@ -2239,6 +2260,7 @@ SignalCallerEvent (
   if (TransReq->CmdDescMapping != NULL) {\r
     UfsHc->Unmap (UfsHc, TransReq->CmdDescMapping);\r
   }\r
+\r
   if (TransReq->CmdDescHost != NULL) {\r
     UfsHc->FreeBuffer (\r
              UfsHc,\r
@@ -2263,36 +2285,37 @@ SignalCallerEvent (
 VOID\r
 EFIAPI\r
 ProcessAsyncTaskList (\r
-  IN EFI_EVENT          Event,\r
-  IN VOID               *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  UFS_PASS_THRU_PRIVATE_DATA                    *Private;\r
-  LIST_ENTRY                                    *Entry;\r
-  LIST_ENTRY                                    *NextEntry;\r
-  UFS_PASS_THRU_TRANS_REQ                       *TransReq;\r
-  EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET    *Packet;\r
-  UTP_RESPONSE_UPIU                             *Response;\r
-  UINT16                                        SenseDataLen;\r
-  UINT32                                        ResTranCount;\r
-  UINT32                                        SlotsMap;\r
-  UINT32                                        Value;\r
-  EFI_STATUS                                    Status;\r
-\r
-  Private   = (UFS_PASS_THRU_PRIVATE_DATA*) Context;\r
-  SlotsMap  = 0;\r
+  UFS_PASS_THRU_PRIVATE_DATA                  *Private;\r
+  LIST_ENTRY                                  *Entry;\r
+  LIST_ENTRY                                  *NextEntry;\r
+  UFS_PASS_THRU_TRANS_REQ                     *TransReq;\r
+  EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet;\r
+  UTP_RESPONSE_UPIU                           *Response;\r
+  UINT16                                      SenseDataLen;\r
+  UINT32                                      ResTranCount;\r
+  UINT32                                      SlotsMap;\r
+  UINT32                                      Value;\r
+  EFI_STATUS                                  Status;\r
+\r
+  Private  = (UFS_PASS_THRU_PRIVATE_DATA *)Context;\r
+  SlotsMap = 0;\r
 \r
   //\r
   // Check the entries in the async I/O queue are done or not.\r
   //\r
-  if (!IsListEmpty(&Private->Queue)) {\r
+  if (!IsListEmpty (&Private->Queue)) {\r
     BASE_LIST_FOR_EACH_SAFE (Entry, NextEntry, &Private->Queue) {\r
-      TransReq  = UFS_PASS_THRU_TRANS_REQ_FROM_THIS (Entry);\r
-      Packet    = TransReq->Packet;\r
+      TransReq = UFS_PASS_THRU_TRANS_REQ_FROM_THIS (Entry);\r
+      Packet   = TransReq->Packet;\r
 \r
       if ((SlotsMap & (BIT0 << TransReq->Slot)) != 0) {\r
         return;\r
       }\r
+\r
       SlotsMap |= BIT0 << TransReq->Slot;\r
 \r
       Status = UfsMmioRead32 (Private, UFS_HC_UTRLDBR_OFFSET, &Value);\r
@@ -2329,10 +2352,10 @@ ProcessAsyncTaskList (
         //\r
         // Get sense data if exists\r
         //\r
-        Response = (UTP_RESPONSE_UPIU*)((UINT8*)TransReq->CmdDescHost + TransReq->Trd->RuO * sizeof (UINT32));\r
+        Response = (UTP_RESPONSE_UPIU *)((UINT8 *)TransReq->CmdDescHost + TransReq->Trd->RuO * sizeof (UINT32));\r
         ASSERT (Response != NULL);\r
         SenseDataLen = Response->SenseDataLen;\r
-        SwapLittleEndianToBigEndian ((UINT8*)&SenseDataLen, sizeof (UINT16));\r
+        SwapLittleEndianToBigEndian ((UINT8 *)&SenseDataLen, sizeof (UINT16));\r
 \r
         if ((Packet->SenseDataLength != 0) && (Packet->SenseData != NULL)) {\r
           //\r
@@ -2360,13 +2383,13 @@ ProcessAsyncTaskList (
           if (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_READ) {\r
             if ((Response->Flags & BIT5) == BIT5) {\r
               ResTranCount = Response->ResTranCount;\r
-              SwapLittleEndianToBigEndian ((UINT8*)&ResTranCount, sizeof (UINT32));\r
+              SwapLittleEndianToBigEndian ((UINT8 *)&ResTranCount, sizeof (UINT32));\r
               Packet->InTransferLength -= ResTranCount;\r
             }\r
           } else {\r
             if ((Response->Flags & BIT5) == BIT5) {\r
               ResTranCount = Response->ResTranCount;\r
-              SwapLittleEndianToBigEndian ((UINT8*)&ResTranCount, sizeof (UINT32));\r
+              SwapLittleEndianToBigEndian ((UINT8 *)&ResTranCount, sizeof (UINT32));\r
               Packet->OutTransferLength -= ResTranCount;\r
             }\r
           }\r
@@ -2400,9 +2423,9 @@ UfsHcDriverInterfaceExecUicCommand (
   IN OUT EDKII_UIC_COMMAND              *UicCommand\r
   )\r
 {\r
-  UFS_PASS_THRU_PRIVATE_DATA    *Private;\r
+  UFS_PASS_THRU_PRIVATE_DATA  *Private;\r
 \r
-  if (This == NULL || UicCommand == NULL) {\r
+  if ((This == NULL) || (UicCommand == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -2441,7 +2464,7 @@ GetUfsHcInfo (
 \r
   Private->UfsHcInfo.Capabilities = Data;\r
 \r
-  if (mUfsHcPlatform != NULL && mUfsHcPlatform->OverrideHcInfo != NULL) {\r
+  if ((mUfsHcPlatform != NULL) && (mUfsHcPlatform->OverrideHcInfo != NULL)) {\r
     Status = mUfsHcPlatform->OverrideHcInfo (Private->Handle, &Private->UfsHcInfo);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "Failure from platform on OverrideHcInfo, Status = %r\n", Status));\r
@@ -2451,4 +2474,3 @@ GetUfsHcInfo (
 \r
   return EFI_SUCCESS;\r
 }\r
-\r