Make EdkModulePkg pass Intel IPF compiler with /W4 /WX switches, solving warning...

[mirror_edk2.git] / EdkModulePkg / Bus / Scsi / ScsiDisk / Dxe / ScsiDisk.c

diff --git a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.c b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.c
index 006cc73bcbcabb1c1918f542928effee484000bd..a3f4d6a3b6a42d2a41488eba55a58b9a12c945e0 100644 (file)
--- a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.c
+++ b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.c
@@ -19,36 +19,11 @@ Abstract:
 \r
 #include "ScsiDisk.h"\r
 \r
-EFI_STATUS\r
-EFIAPI\r
-ScsiDiskDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
-  IN EFI_HANDLE                   Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-ScsiDiskDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
-  IN EFI_HANDLE                   Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-ScsiDiskDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN  EFI_HANDLE                      Controller,\r
-  IN  UINTN                           NumberOfChildren,\r
-  IN  EFI_HANDLE                      *ChildHandleBuffer\r
-  );\r
-\r
 EFI_DRIVER_BINDING_PROTOCOL gScsiDiskDriverBinding = {\r
   ScsiDiskDriverBindingSupported,\r
   ScsiDiskDriverBindingStart,\r
   ScsiDiskDriverBindingStop,\r
-  0x10,\r
+  0xa,\r
   NULL,\r
   NULL\r
 };\r
@@ -874,43 +849,34 @@ Returns:
             &InquiryDataLength,\r
             FALSE\r
             );\r
-  switch (Status) {\r
-  //\r
-  // no need to check HostAdapterStatus and TargetStatus\r
-  //\r
-  case EFI_SUCCESS:\r
-  case EFI_WARN_BUFFER_TOO_SMALL:\r
+  if ((Status == EFI_SUCCESS) || (Status == EFI_WARN_BUFFER_TOO_SMALL)) {\r
+    //\r
+    // no need to check HostAdapterStatus and TargetStatus\r
+    //\r
     ParseInquiryData (ScsiDiskDevice);\r
     return EFI_SUCCESS;\r
-\r
-  case EFI_NOT_READY:\r
+  } else if (Status == EFI_NOT_READY) {\r
+    //\r
+    // no need to check HostAdapterStatus and TargetStatus\r
+    //\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
-\r
-  case EFI_INVALID_PARAMETER:\r
-  case EFI_UNSUPPORTED:\r
+  } else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {\r
+    //\r
+    // no need to check HostAdapterStatus and TargetStatus\r
+    //\r
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r
-\r
+  }\r
   //\r
   // go ahead to check HostAdapterStatus and TargetStatus\r
   // (EFI_TIMEOUT, EFI_DEVICE_ERROR)\r
   //\r
-  default:\r
-    break;\r
-  }\r
-\r
   Status = CheckHostAdapterStatus (HostAdapterStatus);\r
-  switch (Status) {\r
-  case EFI_SUCCESS:\r
-    break;\r
-\r
-  case EFI_TIMEOUT:\r
-  case EFI_NOT_READY:\r
+  if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
-\r
-  case EFI_DEVICE_ERROR:\r
+  } else if (Status == EFI_DEVICE_ERROR) {\r
     //\r
     // reset the scsi channel\r
     //\r
@@ -920,19 +886,14 @@ Returns:
   }\r
 \r
   Status = CheckTargetStatus (TargetStatus);\r
-  switch (Status) {\r
-  case EFI_SUCCESS:\r
-    break;\r
-\r
-  case EFI_NOT_READY:\r
+  if (Status == EFI_NOT_READY) {\r
     //\r
     // reset the scsi device\r
     //\r
     ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
-\r
-  case EFI_DEVICE_ERROR:\r
+  } else if (Status == EFI_DEVICE_ERROR) {\r
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r
   }\r
@@ -1022,37 +983,27 @@ ScsiDiskTestUnitReady (
             &HostAdapterStatus,\r
             &TargetStatus\r
             );\r
-  switch (Status) {\r
-  //\r
-  // no need to check HostAdapterStatus and TargetStatus\r
-  //\r
-  case EFI_NOT_READY:\r
+  if (Status == EFI_NOT_READY) {\r
+    //\r
+    // no need to check HostAdapterStatus and TargetStatus\r
+    //\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
-\r
-  case EFI_INVALID_PARAMETER:\r
-  case EFI_UNSUPPORTED:\r
+  } else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {\r
+    //\r
+    // no need to check HostAdapterStatus and TargetStatus\r
+    //\r
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r
-\r
+  }\r
   //\r
   // go ahead to check HostAdapterStatus and TargetStatus\r
   //\r
-  default:\r
-    break;\r
-  }\r
-\r
   Status = CheckHostAdapterStatus (HostAdapterStatus);\r
-  switch (Status) {\r
-  case EFI_SUCCESS:\r
-    break;\r
-\r
-  case EFI_TIMEOUT:\r
-  case EFI_NOT_READY:\r
+  if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
-\r
-  case EFI_DEVICE_ERROR:\r
+  } else if (Status == EFI_DEVICE_ERROR) {\r
     //\r
     // reset the scsi channel\r
     //\r
@@ -1062,19 +1013,14 @@ ScsiDiskTestUnitReady (
   }\r
 \r
   Status = CheckTargetStatus (TargetStatus);\r
-  switch (Status) {\r
-  case EFI_SUCCESS:\r
-    break;\r
-\r
-  case EFI_NOT_READY:\r
+  if (Status == EFI_NOT_READY) {\r
     //\r
     // reset the scsi device\r
     //\r
     ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
-\r
-  case EFI_DEVICE_ERROR:\r
+  } else if (Status == EFI_DEVICE_ERROR) {\r
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r
   }\r
@@ -1258,42 +1204,35 @@ Returns:
                     &DataLength,\r
                     FALSE\r
                     );\r
-  switch (CommandStatus) {\r
-  //\r
-  // no need to check HostAdapterStatus and TargetStatus\r
-  //\r
-  case EFI_SUCCESS:\r
+  if (CommandStatus == EFI_SUCCESS) {\r
+    //\r
+    // no need to check HostAdapterStatus and TargetStatus\r
+    //\r
     GetMediaInfo (ScsiDiskDevice, &CapacityData);\r
     return EFI_SUCCESS;\r
-\r
-  case EFI_NOT_READY:\r
+  } else if (CommandStatus == EFI_NOT_READY) {\r
+    //\r
+    // no need to check HostAdapterStatus and TargetStatus\r
+    //\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
-\r
-  case EFI_INVALID_PARAMETER:\r
-  case EFI_UNSUPPORTED:\r
+  } else if ((CommandStatus == EFI_INVALID_PARAMETER) || (CommandStatus == EFI_UNSUPPORTED)) {\r
+    //\r
+    // no need to check HostAdapterStatus and TargetStatus\r
+    //\r
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r
-\r
+  }\r
   //\r
   // go ahead to check HostAdapterStatus and TargetStatus\r
   // (EFI_TIMEOUT, EFI_DEVICE_ERROR, EFI_WARN_BUFFER_TOO_SMALL)\r
   //\r
-  default:\r
-    break;\r
-  }\r
-\r
+  \r
   Status = CheckHostAdapterStatus (HostAdapterStatus);\r
-  switch (Status) {\r
-  case EFI_SUCCESS:\r
-    break;\r
-\r
-  case EFI_TIMEOUT:\r
-  case EFI_NOT_READY:\r
+  if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
-\r
-  case EFI_DEVICE_ERROR:\r
+  } else if (Status == EFI_DEVICE_ERROR) {\r
     //\r
     // reset the scsi channel\r
     //\r
@@ -1303,19 +1242,14 @@ Returns:
   }\r
 \r
   Status = CheckTargetStatus (TargetStatus);\r
-  switch (Status) {\r
-  case EFI_SUCCESS:\r
-    break;\r
-\r
-  case EFI_NOT_READY:\r
+  if (Status == EFI_NOT_READY) {\r
     //\r
     // reset the scsi device\r
     //\r
     ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
-\r
-  case EFI_DEVICE_ERROR:\r
+  } else if (Status == EFI_DEVICE_ERROR) {\r
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r
   }\r
@@ -1506,40 +1440,20 @@ ScsiDiskRequestSenseKeys (
               &HostAdapterStatus,\r
               &TargetStatus\r
               );\r
-    switch (Status) {\r
-\r
-    case EFI_SUCCESS:\r
-\r
-    //\r
-    // fall through\r
-    //\r
-    case EFI_WARN_BUFFER_TOO_SMALL:\r
+    if ((Status == EFI_SUCCESS) || (Status == EFI_WARN_BUFFER_TOO_SMALL)) {\r
       FallStatus = EFI_SUCCESS;\r
-      break;\r
-\r
-    case EFI_TIMEOUT:\r
-\r
-    //\r
-    // fall through\r
-    //\r
-    case EFI_NOT_READY:\r
+    } else if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) { \r
       *NeedRetry  = TRUE;\r
       FallStatus  = EFI_DEVICE_ERROR;\r
-      break;\r
-\r
-    case EFI_INVALID_PARAMETER:\r
-    case EFI_UNSUPPORTED:\r
+    } else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {\r
       *NeedRetry  = FALSE;\r
       FallStatus  = EFI_DEVICE_ERROR;\r
-      break;\r
-\r
-    case EFI_DEVICE_ERROR:\r
+    } else if (Status == EFI_DEVICE_ERROR) {\r
       if (AskResetIfError) {\r
         ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
       }\r
 \r
       FallStatus = EFI_DEVICE_ERROR;\r
-      break;\r
     }\r
 \r
     if (EFI_ERROR (FallStatus)) {\r
@@ -1675,11 +1589,9 @@ Returns:
   UINT8               MaxRetry;\r
   BOOLEAN             NeedRetry;\r
   EFI_SCSI_SENSE_DATA *SenseData;\r
-  UINT8               SenseDataLength;\r
   UINTN               NumberOfSenseKeys;\r
 \r
   SenseData         = NULL;\r
-  SenseDataLength   = 0;\r
   NumberOfSenseKeys = 0;\r
 \r
   Status            = EFI_SUCCESS;\r
@@ -1789,11 +1701,9 @@ Returns:
   UINT8               MaxRetry;\r
   BOOLEAN             NeedRetry;\r
   EFI_SCSI_SENSE_DATA *SenseData;\r
-  UINT8               SenseDataLength;\r
   UINTN               NumberOfSenseKeys;\r
 \r
   SenseData         = NULL;\r
-  SenseDataLength   = 0;\r
   NumberOfSenseKeys = 0;\r
 \r
   Status            = EFI_SUCCESS;\r