Partially make EdkModulePkg pass intel IPF compiler with /W4 /WX switched on.

[mirror_edk2.git] / EdkModulePkg / Bus / Pci / IdeBus / Dxe / atapi.c

diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/atapi.c b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/atapi.c
index a54acf6994f3a1130f772de78a4181414d19dc99..93f7081516172a3fa7c0b9810eb602d988f6d443 100644 (file)
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/atapi.c
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/atapi.c
@@ -713,11 +713,6 @@ PioReadWriteData (
   EFI_STATUS  Status;\r
   UINT16      *PtrBuffer;\r
 \r
-  //\r
-  // containing status byte read from Status Register.\r
-  //\r
-  UINT8       StatusRegister;\r
-\r
   //\r
   // No data transfer is premitted.\r
   //\r
@@ -750,16 +745,14 @@ PioReadWriteData (
     //\r
     // read Status Register will clear interrupt\r
     //\r
-    StatusRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Status);\r
+    IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Status);\r
 \r
     //\r
     // get current data transfer size from Cylinder Registers.\r
     //\r
-    WordCount =\r
-      (\r
-        (IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->CylinderMsb) << 8) |\r
-        IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->CylinderLsb)\r
-      ) & 0xffff;\r
+    WordCount = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->CylinderMsb) << 8;\r
+    WordCount = WordCount | IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->CylinderLsb);\r
+    WordCount = WordCount & 0xffff;\r
     WordCount /= 2;\r
 \r
     WordCount = EFI_MIN (WordCount, (RequiredWordCount - ActualWordCount));\r