From cd5b2ae437553df0e491f926b8748bf88809e76a Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Thu, 19 Jan 2017 18:16:04 +0800 Subject: [PATCH] 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 Reviewed-by: Star Zeng --- MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c | 3 --- MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 3 --- MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c | 3 --- MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c | 3 --- 4 files changed, 12 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c index 51cff3c96c..ad6cdb15a5 100644 --- 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. // Status = NvmeCreateIoSubmissionQueue (Private); - if (EFI_ERROR(Status)) { - return Status; - } return Status; } diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c index 3f73194da7..9dbec1016d 100755 --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c @@ -783,9 +783,6 @@ EmmcSwitchToHighSpeed ( HsTiming = 1; Status = EmmcSwitchClockFreq (PciIo, PassThru, Slot, Rca, HsTiming, ClockFreq); - if (EFI_ERROR (Status)) { - return Status; - } return Status; } diff --git a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c b/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c index d6d3bdbd91..5a9e0b2f14 100644 --- a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c +++ b/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c @@ -2520,9 +2520,6 @@ EmmcPeimSwitchToHighSpeed ( HsTiming = 1; Status = EmmcPeimSwitchClockFreq (Slot, Rca, HsTiming, ClockFreq); - if (EFI_ERROR (Status)) { - return Status; - } return Status; } diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c index 7ef141facf..01bec197bb 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c @@ -1465,9 +1465,6 @@ ConSplitterStdErrDriverBindingStart ( // Status = ConSplitterTextOutAddDevice (&mStdErr, TextOut, NULL, NULL); ConSplitterTextOutSetAttribute (&mStdErr.TextOut, EFI_TEXT_ATTR (EFI_MAGENTA, EFI_BLACK)); - if (EFI_ERROR (Status)) { - return Status; - } return Status; }