MdeModulePkg: Remove superfluous return statements

If the code eventually returns "Status" anyway, it does not make
sense to explicitly return "Status" in case of an error, too.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
index 51cff3c96c29c0e9dbd2a57940135cf5f45920a4..ad6cdb15a59a9220687901e517c581e82b800cbe 100644 (file)
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
@@ -1046,9 +1046,6 @@ NvmeControllerInit (
   // One for blocking I/O, one for non-blocking I/O.\r
   //\r
   Status = NvmeCreateIoSubmissionQueue (Private);\r
-  if (EFI_ERROR(Status)) {\r
-   return Status;\r
-  }\r
 \r
   return Status;\r
 }\r

diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
index 3f73194da7ff7041d029198e4569bd059fc5ac54..9dbec1016d52a125b33eaedb0ac513ddd33d4caf 100755 (executable)
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
+++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
@@ -783,9 +783,6 @@ EmmcSwitchToHighSpeed (
 \r
   HsTiming = 1;\r
   Status = EmmcSwitchClockFreq (PciIo, PassThru, Slot, Rca, HsTiming, ClockFreq);\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
 \r
   return Status;\r
 }\r

diff --git a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c b/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c
index d6d3bdbd91ebfbaccfc5c6480c6b94c0f159fe45..5a9e0b2f14eadd0bee24c565e66bd7fb949b9d77 100644 (file)
--- a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c
+++ b/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c
@@ -2520,9 +2520,6 @@ EmmcPeimSwitchToHighSpeed (
 \r
   HsTiming = 1;\r
   Status = EmmcPeimSwitchClockFreq (Slot, Rca, HsTiming, ClockFreq);\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
 \r
   return Status;\r
 }\r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index 7ef141facf36bddeb0ab0f445ecf66213aae5070..01bec197bbc124db06ffc9d9ace86d1832387e3e 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
@@ -1465,9 +1465,6 @@ ConSplitterStdErrDriverBindingStart (
   //\r
   Status = ConSplitterTextOutAddDevice (&mStdErr, TextOut, NULL, NULL);\r
   ConSplitterTextOutSetAttribute (&mStdErr.TextOut, EFI_TEXT_ATTR (EFI_MAGENTA, EFI_BLACK));\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
 \r
   return Status;\r
 }\r