MdeModulePkg/NvmExpressDxe: local variable naming uniformed

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tian Feng <feng.tian@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17637 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
index 0b17ebd4b7c58e385500f6e57d22cf4bdd9c1db2..e7d76513221794326e79783360efebef514ff09c 100644 (file)
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
@@ -35,7 +35,7 @@ ReadSectors (
   IN UINT32                             Blocks\r
   )\r
 {\r
-  NVME_CONTROLLER_PRIVATE_DATA             *Controller;\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
@@ -43,7 +43,7 @@ ReadSectors (
   EFI_STATUS                               Status;\r
   UINT32                                   BlockSize;\r
 \r
-  Controller = Device->Controller;\r
+  Private    = Device->Controller;\r
   BlockSize  = Device->Media.BlockSize;\r
   Bytes      = Blocks * BlockSize;\r
 \r
@@ -68,12 +68,12 @@ ReadSectors (
 \r
   CommandPacket.NvmeCmd->Flags = CDW10_VALID | CDW11_VALID | CDW12_VALID;\r
 \r
-  Status = Controller->Passthru.PassThru (\r
-                                  &Controller->Passthru,\r
-                                  Device->NamespaceId,\r
-                                  &CommandPacket,\r
-                                  NULL\r
-                                  );\r
+  Status = Private->Passthru.PassThru (\r
+                               &Private->Passthru,\r
+                               Device->NamespaceId,\r
+                               &CommandPacket,\r
+                               NULL\r
+                               );\r
 \r
   return Status;\r
 }\r
@@ -98,7 +98,7 @@ WriteSectors (
   IN UINT32                        Blocks\r
   )\r
 {\r
-  NVME_CONTROLLER_PRIVATE_DATA             *Controller;\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
@@ -106,7 +106,7 @@ WriteSectors (
   UINT32                                   Bytes;\r
   UINT32                                   BlockSize;\r
 \r
-  Controller = Device->Controller;\r
+  Private    = Device->Controller;\r
   BlockSize  = Device->Media.BlockSize;\r
   Bytes      = Blocks * BlockSize;\r
 \r
@@ -134,12 +134,12 @@ WriteSectors (
 \r
   CommandPacket.NvmeCmd->Flags = CDW10_VALID | CDW11_VALID | CDW12_VALID;\r
 \r
-  Status = Controller->Passthru.PassThru (\r
-                                  &Controller->Passthru,\r
-                                  Device->NamespaceId,\r
-                                  &CommandPacket,\r
-                                  NULL\r
-                                  );\r
+  Status = Private->Passthru.PassThru (\r
+                               &Private->Passthru,\r
+                               Device->NamespaceId,\r
+                               &CommandPacket,\r
+                               NULL\r
+                               );\r
 \r
   return Status;\r
 }\r
@@ -166,17 +166,17 @@ NvmeRead (
 {\r
   EFI_STATUS                       Status;\r
   UINT32                           BlockSize;\r
-  NVME_CONTROLLER_PRIVATE_DATA     *Controller;\r
+  NVME_CONTROLLER_PRIVATE_DATA     *Private;\r
   UINT32                           MaxTransferBlocks;\r
   UINTN                            OrginalBlocks;\r
 \r
   Status        = EFI_SUCCESS;\r
-  Controller    = Device->Controller;\r
+  Private       = Device->Controller;\r
   BlockSize     = Device->Media.BlockSize;\r
   OrginalBlocks = Blocks;\r
 \r
-  if (Controller->ControllerData->Mdts != 0) {\r
-    MaxTransferBlocks = (1 << (Controller->ControllerData->Mdts)) * (1 << (Controller->Cap.Mpsmin + 12)) / BlockSize;\r
+  if (Private->ControllerData->Mdts != 0) {\r
+    MaxTransferBlocks = (1 << (Private->ControllerData->Mdts)) * (1 << (Private->Cap.Mpsmin + 12)) / BlockSize;\r
   } else {\r
     MaxTransferBlocks = 1024;\r
   }\r
@@ -225,17 +225,17 @@ NvmeWrite (
 {\r
   EFI_STATUS                       Status;\r
   UINT32                           BlockSize;\r
-  NVME_CONTROLLER_PRIVATE_DATA     *Controller;\r
+  NVME_CONTROLLER_PRIVATE_DATA     *Private;\r
   UINT32                           MaxTransferBlocks;\r
   UINTN                            OrginalBlocks;\r
 \r
   Status        = EFI_SUCCESS;\r
-  Controller    = Device->Controller;\r
+  Private       = Device->Controller;\r
   BlockSize     = Device->Media.BlockSize;\r
   OrginalBlocks = Blocks;\r
 \r
-  if (Controller->ControllerData->Mdts != 0) {\r
-    MaxTransferBlocks = (1 << (Controller->ControllerData->Mdts)) * (1 << (Controller->Cap.Mpsmin + 12)) / BlockSize;\r
+  if (Private->ControllerData->Mdts != 0) {\r
+    MaxTransferBlocks = (1 << (Private->ControllerData->Mdts)) * (1 << (Private->Cap.Mpsmin + 12)) / BlockSize;\r
   } else {\r
     MaxTransferBlocks = 1024;\r
   }\r
@@ -276,13 +276,13 @@ NvmeFlush (
   IN NVME_DEVICE_PRIVATE_DATA      *Device\r
   )\r
 {\r
-  NVME_CONTROLLER_PRIVATE_DATA             *Controller;\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
-  Controller = Device->Controller;\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
@@ -296,12 +296,12 @@ NvmeFlush (
   CommandPacket.CommandTimeout = NVME_GENERIC_TIMEOUT;\r
   CommandPacket.QueueType      = NVME_IO_QUEUE;\r
 \r
-  Status = Controller->Passthru.PassThru (\r
-                                  &Controller->Passthru,\r
-                                  Device->NamespaceId,\r
-                                  &CommandPacket,\r
-                                  NULL\r
-                                  );\r
+  Status = Private->Passthru.PassThru (\r
+                               &Private->Passthru,\r
+                               Device->NamespaceId,\r
+                               &CommandPacket,\r
+                               NULL\r
+                               );\r
 \r
   return Status;\r
 }\r