MdeModulePkg: Remove variables that are set, but not used

GCC 4.6 generates a warning when a variable is set,
but never used.

Signed-off-by: jljusten
Reviewed-by: lgao4
Reviewed-by: erictian
Reviewed-by: rsun3

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12617 6f19259b-4bc3-4df7-8a09-765794883524

15 files changed, 27 insertions, 81 deletions

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
index 6c8d4b2df6..0bc54abbf7 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
@@ -1389,7 +1389,6 @@ AhciReset (
   IN  UINT64                    Timeout

   )    

 {

-  EFI_STATUS             Status;

   UINT32                 Delay;

   UINT32                 Value;

 

@@ -1397,8 +1396,6 @@ AhciReset (
 

   AhciOrReg (PciIo, EFI_AHCI_GHC_OFFSET, EFI_AHCI_GHC_RESET);

 

-  Status  = EFI_TIMEOUT;

-

   Delay = (UINT32) (DivU64x32(Timeout, 1000) + 1);

 

   do {

@@ -2137,8 +2134,6 @@ AhciModeInitialization (
   UINT32                           Capability;

   UINT8                            MaxPortNumber;

   UINT32                           PortImplementBitMap;

-  UINT8                            MaxCommandSlotNumber;

-  BOOLEAN                          Support64Bit;

 

   EFI_AHCI_REGISTERS               *AhciRegisters;

 

@@ -2178,9 +2173,7 @@ AhciModeInitialization (
   //

   // Get the number of command slots per port supported by this HBA.

   //

-  MaxCommandSlotNumber = (UINT8) (((Capability & 0x1F00) >> 8) + 1);

   MaxPortNumber        = (UINT8) ((Capability & 0x1F) + 1);

-  Support64Bit         = (BOOLEAN) (((Capability & EFI_AHCI_CAP_S64A) != 0) ? TRUE : FALSE);

 

   //

   // Get the bit map of those ports exposed by this HBA.

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
index 526590718a..72196a0040 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
@@ -658,13 +658,11 @@ AtaAtapiPassThruStart (
   ATA_ATAPI_PASS_THRU_INSTANCE      *Instance;

   EFI_PCI_IO_PROTOCOL               *PciIo;

   UINT64                            Supports;

-  BOOLEAN                           PciAttributesSaved;

   UINT64                            OriginalPciAttributes;

 

   Status                = EFI_SUCCESS;

   IdeControllerInit     = NULL;

   Instance              = NULL;

-  PciAttributesSaved    = FALSE;

   OriginalPciAttributes = 0;

 

   DEBUG ((EFI_D_INFO, "==AtaAtapiPassThru Start== Controller = %x\n", Controller));

@@ -706,7 +704,6 @@ AtaAtapiPassThruStart (
   if (EFI_ERROR (Status)) {

     goto ErrorExit;

   }

-  PciAttributesSaved = TRUE;

 

   Status = PciIo->Attributes (

                     PciIo,

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
index 17e4d7e13a..79310fcb49 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
@@ -1482,7 +1482,6 @@ AtaUdmaInOut (
   EFI_PCI_IO_PROTOCOL_OPERATION PciIoOperation;

 

   UINT8                         DeviceHead;

-  UINT8                         AtaCommand;

   EFI_PCI_IO_PROTOCOL           *PciIo;

   EFI_TPL                       OldTpl;

 

@@ -1639,7 +1638,6 @@ AtaUdmaInOut (
     // Start to enable the DMA operation

     //

     DeviceHead = AtaCommandBlock->AtaDeviceHead;

-    AtaCommand = AtaCommandBlock->AtaCommand;

 

     IdeWritePortB (PciIo, IdeRegisters->Head, (UINT8)(0xe0 | DeviceHead));

 

@@ -2797,7 +2795,6 @@ IdeModeInitialization (
   IN  ATA_ATAPI_PASS_THRU_INSTANCE    *Instance

   )

 {

-  BOOLEAN                           EnumAll;

   EFI_STATUS                        Status;

   EFI_IDE_CONTROLLER_INIT_PROTOCOL  *IdeInit;

   EFI_PCI_IO_PROTOCOL               *PciIo;

@@ -2808,7 +2805,6 @@ IdeModeInitialization (
 

   IdeInit = Instance->IdeControllerInit;

   PciIo   = Instance->PciIo;

-  EnumAll = IdeInit->EnumAll;

   Channel = IdeInit->ChannelCount;

 

   //

diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c b/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c
index d153aa39dc..8e9dad12d2 100644
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c
+++ b/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c
@@ -2,7 +2,7 @@
 PEIM to produce gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid

 which is used to enable recovery function from USB Drivers.

 

-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>

   

 This program and the accompanying materials

 are licensed and made available under the terms and conditions

@@ -264,7 +264,6 @@ EhcUnlinkQhFromAsync (
   )

 {

   PEI_EHC_QH              *Head;

-  EFI_STATUS              Status;

 

   ASSERT (Ehc->ReclaimHead->NextQh == Qh);

 

@@ -283,7 +282,7 @@ EhcUnlinkQhFromAsync (
   //

   // Set and wait the door bell to synchronize with the hardware

   //

-  Status = EhcSetAndWaitDoorBell (Ehc, EHC_GENERIC_TIMEOUT);

+  EhcSetAndWaitDoorBell (Ehc, EHC_GENERIC_TIMEOUT);

   

   return;

 }

@@ -804,8 +803,7 @@ EhcMoniteAsyncRequests (
   BOOLEAN                 Finished;

   UINT8                   *ProcBuf;

   PEI_URB                 *Urb;

-  EFI_STATUS              Status;

-  UINTN               PageNumber;

+  UINTN                   PageNumber;

 

   Ehc     = (PEI_USB2_HC_DEV *) Context;

 

@@ -826,7 +824,7 @@ EhcMoniteAsyncRequests (
     // Flush any PCI posted write transactions from a PCI host 

     // bridge to system memory.

     //

-    Status = EhcFlushAsyncIntMap (Ehc, Urb);

+    EhcFlushAsyncIntMap (Ehc, Urb);

     

     //

     // Allocate a buffer then copy the transferred data for user.

@@ -838,11 +836,11 @@ EhcMoniteAsyncRequests (
     if (Urb->Result == EFI_USB_NOERROR) {

       ASSERT (Urb->Completed <= Urb->DataLen);

       PageNumber =  Urb->Completed/PAGESIZE +1;

-      Status = PeiServicesAllocatePages (

-                 EfiBootServicesCode,

-                 PageNumber,

-                 (EFI_PHYSICAL_ADDRESS *)ProcBuf

-                 );

+      PeiServicesAllocatePages (

+        EfiBootServicesCode,

+        PageNumber,

+        (EFI_PHYSICAL_ADDRESS *)ProcBuf

+        );

       if (ProcBuf == NULL) {

         EhcUpdateAsyncRequest (Urb);

         continue;

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
index bbde0ca0b7..5ccb78e55b 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
@@ -973,16 +973,16 @@ XhcControlTransfer (
       //

       // For super speed hub, its bit10~12 presents the attached device speed.

       //

-      if ((*(UINT32 *)Data & XHC_PORTSC_PS) >> 10 == 0) {

+      if ((State & XHC_PORTSC_PS) >> 10 == 0) {

         PortStatus.PortStatus |= USB_PORT_STAT_SUPER_SPEED;

       }

     } else if (DeviceSpeed == EFI_USB_SPEED_HIGH) {

       //

       // For high speed hub, its bit9~10 presents the attached device speed.

       //

-      if (XHC_BIT_IS_SET (*(UINT32 *)Data, BIT9)) {

+      if (XHC_BIT_IS_SET (State, BIT9)) {

         PortStatus.PortStatus |= USB_PORT_STAT_LOW_SPEED;

-      } else if (XHC_BIT_IS_SET (*(UINT32 *)Data, BIT10)) {

+      } else if (XHC_BIT_IS_SET (State, BIT10)) {

         PortStatus.PortStatus |= USB_PORT_STAT_HIGH_SPEED;

       }

     } else {

@@ -994,14 +994,14 @@ XhcControlTransfer (
     //

     MapSize = sizeof (mUsbPortStateMap) / sizeof (USB_PORT_STATE_MAP);

     for (Index = 0; Index < MapSize; Index++) {

-      if (XHC_BIT_IS_SET (*(UINT32 *)Data, mUsbPortStateMap[Index].HwState)) {

+      if (XHC_BIT_IS_SET (State, mUsbPortStateMap[Index].HwState)) {

         PortStatus.PortStatus = (UINT16) (PortStatus.PortStatus | mUsbPortStateMap[Index].UefiState);

       }

     }

     MapSize = sizeof (mUsbPortChangeMap) / sizeof (USB_PORT_STATE_MAP);

 

     for (Index = 0; Index < MapSize; Index++) {

-      if (XHC_BIT_IS_SET (*(UINT32 *)Data, mUsbPortChangeMap[Index].HwState)) {

+      if (XHC_BIT_IS_SET (State, mUsbPortChangeMap[Index].HwState)) {

       PortStatus.PortChangeStatus = (UINT16) (PortStatus.PortChangeStatus | mUsbPortChangeMap[Index].UefiState);

       }

     }

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
index 6745d2f81a..49cc2619eb 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
@@ -181,6 +181,7 @@ XhcCreateUrb (
   Urb->Context  = Context;

 

   Status = XhcCreateTransferTrb (Xhc, Urb);

+  ASSERT_EFI_ERROR (Status);

 

   return Urb;

 }

@@ -740,13 +741,11 @@ XhcFreeEventRing (
   EVENT_RING_SEG_TABLE_ENTRY    *TablePtr;

   VOID                          *RingBuf;

   EVENT_RING_SEG_TABLE_ENTRY    *EventRingPtr;

-  UINTN                         InterrupterTarget;

 

   if(EventRing->EventRingSeg0 == NULL) {

     return EFI_SUCCESS;

   }

 

-  InterrupterTarget = EventRing->EventInterrupter;

   //

   // Get the Event Ring Segment Table base address

   //

@@ -1048,12 +1047,10 @@ XhciDelAsyncIntTransfer (
   LIST_ENTRY              *Next;

   URB                     *Urb;

   EFI_USB_DATA_DIRECTION  Direction;

-  BOOLEAN                 Found;

 

   Direction = ((EpNum & 0x80) != 0) ? EfiUsbDataIn : EfiUsbDataOut;

   EpNum    &= 0x0F;

 

-  Found = FALSE;

   Urb   = NULL;

 

   EFI_LIST_FOR_EACH_SAFE (Entry, Next, &Xhc->AsyncIntTransfers) {

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
index e830517dd9..e3ff281643 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
@@ -534,10 +534,8 @@ UsbBootGetParams (
 {

   EFI_BLOCK_IO_MEDIA          *Media;

   EFI_STATUS                  Status;

-  UINT8                       CmdSet;

 

   Media  = &(UsbMass->BlockIoMedia);

-  CmdSet = ((EFI_USB_INTERFACE_DESCRIPTOR *) (UsbMass->Context))->InterfaceSubClass;

 

   Status = UsbBootInquiry (UsbMass);

   if (EFI_ERROR (Status)) {

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index ffeab4e391..0392cfe1e8 100644
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -265,8 +265,6 @@ PeiLoadFixAddressHook(
   EFI_PEI_HOB_POINTERS               CurrentHob;

   EFI_PEI_HOB_POINTERS               Hob;

   EFI_PEI_HOB_POINTERS               NextHob;

-  EFI_PHYSICAL_ADDRESS               MaxMemoryBaseAddress;

-  UINT64                             MaxMemoryLength;

   EFI_HOB_MEMORY_ALLOCATION          *MemoryHob;

   //

   // Initialize Local Variables

@@ -274,8 +272,6 @@ PeiLoadFixAddressHook(
   CurrentResourceHob    = NULL;

   ResourceHob           = NULL;

   NextResourceHob       = NULL;

-  MaxMemoryBaseAddress  = 0;

-  MaxMemoryLength       = 0;

   HighAddress           = 0;

   TopLoadingAddress     = 0;

   MemoryRangeEnd      = 0;

diff --git a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
index 671c3332f9..3b4d4e03ad 100644
--- a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
+++ b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
@@ -1134,7 +1134,6 @@ InternalPrintLibSPrintMarker (
   IN  BASE_LIST    BaseListMarker  OPTIONAL

   )

 {

-  CHAR8             *OriginalBuffer;

   CHAR8             *EndBuffer;

   CHAR8             ValueBuffer[MAXIMUM_VALUE_CHARACTERS];

   UINT32            BytesPerOutputCharacter;

@@ -1185,7 +1184,6 @@ InternalPrintLibSPrintMarker (
   // Reserve space for the Null terminator.

   //

   BufferSize--;

-  OriginalBuffer = Buffer;

 

   //

   // Set the tag for the end of the input Buffer.

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
index a87441e2c0..7a2415e9e5 100644
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
@@ -1630,12 +1630,11 @@ InternalHiiIfrValueAction (
   EFI_GUID       *VarGuid;

   EFI_STRING     VarName;

 

-  UINT8                        *PackageData;

   EFI_HII_PACKAGE_LIST_HEADER  *HiiPackageList;

   UINTN                        PackageListLength;

   EFI_DEVICE_PATH_PROTOCOL     *DevicePath;

   EFI_DEVICE_PATH_PROTOCOL     *TempDevicePath;

-  

+

   ConfigAltResp = NULL;

   ConfigResp    = NULL;

   VarGuid       = NULL;

@@ -1646,7 +1645,6 @@ InternalHiiIfrValueAction (
   Index            = 0;

   TempDriverHandle = NULL;

   HiiHandle        = NULL;

-  PackageData      = NULL;

   HiiPackageList   = NULL;

   

   //

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c
index fe2c7613e5..9f47b48835 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c
@@ -1,7 +1,7 @@
 /** @file

   ACPI Sdt Protocol Driver

 

-  Copyright (c) 2010, Intel Corporation. All rights reserved. <BR>

+  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved. <BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -117,9 +117,7 @@ AmlGetNameStringSize (
   UINTN                 SegCount;

   UINTN                 Length;

   UINTN                 Index;

-  UINT8                 *Name;

 

-  Name = Buffer;

   Length = 0;

 

   //

@@ -493,9 +491,7 @@ AmlPrintNameString (
 {

   UINT8                 SegCount;

   UINT8                 Index;

-  UINT8                 *Name;

- 

-  Name = Buffer;

+

   if (*Buffer == AML_ROOT_CHAR) {

     //

     // RootChar

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index b6621a93e2..37a592ce90 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -662,7 +662,6 @@ AppendAltCfgString (
   )

 {

   EFI_STRING                          StringPtr;

-  EFI_STRING                          TmpPtr;

   UINTN                               Length;

   UINT8                               *TmpBuffer;

   UINTN                               Offset;

@@ -683,11 +682,6 @@ AppendAltCfgString (
   }

 

   while (*StringPtr != 0 && StrnCmp (StringPtr, L"OFFSET=", StrLen (L"OFFSET=")) == 0) {

-    //

-    // Back up the header of one <BlockName>

-    //

-    TmpPtr = StringPtr;

-

     StringPtr += StrLen (L"OFFSET=");

     //

     // Get Offset

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c
index 023733b8d5..6a92573275 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c
@@ -1,7 +1,7 @@
 /** @file

   IP4 option support functions.

   

-Copyright (c) 2005 - 2006, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -17,8 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 /**

   Validate the IP4 option format for both the packets we received

-  and will transmit. It will compute the ICMP error message fields

-  if the option is mal-formated. But this information isn't used.

+  and will transmit.

 

   @param[in]  Option            The first byte of the option

   @param[in]  OptionLen         The length of the whole option

@@ -39,13 +38,6 @@ Ip4OptionIsValid (
   UINT32                    Cur;

   UINT32                    Len;

   UINT32                    Point;

-  volatile UINT8            IcmpType;

-  volatile UINT8            IcmpCode;

-  volatile UINT32           IcmpPoint;

-

-  IcmpType  = ICMP_PARAMETER_PROBLEM;

-  IcmpCode  = 0;

-  IcmpPoint = 0;

 

   Cur       = 0;

 

@@ -69,12 +61,10 @@ Ip4OptionIsValid (
       // SRR/RR options are formatted as |Type|Len|Point|Ip1|Ip2|...

       //

       if ((OptionLen - Cur < Len) || (Len < 3) || ((Len - 3) % 4 != 0)) {

-        IcmpPoint = Cur + 1;

         return FALSE;

       }

 

       if ((Point > Len + 1) || (Point % 4 != 0)) {

-        IcmpPoint = Cur + 2;

         return FALSE;

       }

 

@@ -86,8 +76,6 @@ Ip4OptionIsValid (
       if ((Option[Cur] != IP4_OPTION_RR) &&

           ((Rcvd && (Point != Len + 1)) || (!Rcvd && (Point != 4)))) {

 

-        IcmpType  = ICMP_DEST_UNREACHABLE;

-        IcmpCode  = ICMP_SOURCEROUTE_FAILED;

         return FALSE;

       }

 

@@ -98,7 +86,6 @@ Ip4OptionIsValid (
       Len = Option[Cur + 1];

 

       if ((OptionLen - Cur < Len) || (Len < 2)) {

-        IcmpPoint = Cur + 1;

         return FALSE;

       }

 

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index b58a00a544..80e3a71edd 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -1005,7 +1005,6 @@ FindNextMenu (
   CHAR16                  YesResponse;

   CHAR16                  NoResponse;

   EFI_INPUT_KEY           Key;

-  EFI_STATUS              Status;

   BROWSER_SETTING_SCOPE   Scope;

   

   CurrentMenu = Selection->CurrentMenu;

@@ -1032,7 +1031,7 @@ FindNextMenu (
     //

     if ((gBrowserSettingScope == FormLevel && Selection->Form->NvUpdateRequired) ||

         (gBrowserSettingScope == FormSetLevel && IsNvUpdateRequired(Selection->FormSet) && Scope == FormSetLevel)) {

-      Status      = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);

+      gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);

   

       YesResponse = gYesResponse[0];

       NoResponse  = gNoResponse[0];

@@ -1068,12 +1067,12 @@ FindNextMenu (
         //

         // If the user hits the YesResponse key

         //

-        Status = SubmitForm (Selection->FormSet, Selection->Form, Scope);

+        SubmitForm (Selection->FormSet, Selection->Form, Scope);

       } else {

         //

         // If the user hits the NoResponse key

         //

-        Status = DiscardForm (Selection->FormSet, Selection->Form, Scope);

+        DiscardForm (Selection->FormSet, Selection->Form, Scope);

       }

     }

 

@@ -1101,7 +1100,7 @@ FindNextMenu (
   // We are going to leave current FormSet, so check uncommited data in this FormSet

   //

   if (gBrowserSettingScope != SystemLevel && IsNvUpdateRequired(Selection->FormSet)) {

-    Status      = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);

+    gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);

 

     YesResponse = gYesResponse[0];

     NoResponse  = gNoResponse[0];

@@ -1138,12 +1137,12 @@ FindNextMenu (
       //

       // If the user hits the YesResponse key

       //

-      Status = SubmitForm (Selection->FormSet, Selection->Form, FormSetLevel);

+      SubmitForm (Selection->FormSet, Selection->Form, FormSetLevel);

     } else {

       //

       // If the user hits the NoResponse key

       //

-      Status = DiscardForm (Selection->FormSet, Selection->Form, FormSetLevel);

+      DiscardForm (Selection->FormSet, Selection->Form, FormSetLevel);

     }

   }

 

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index a1e6f81ecb..00462a270f 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -4128,7 +4128,6 @@ SaveReminder (
   CHAR16                  *ChangeReminderString;

   CHAR16                  *SaveConfirmString;

   EFI_INPUT_KEY           Key;

-  EFI_STATUS              Status;

 

   DataSavedAction  = BROWSER_NO_CHANGES;

   IsDataChanged    = FALSE;

@@ -4152,7 +4151,7 @@ SaveReminder (
   //

   // If data is changed, prompt user

   //

-  Status      = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);

+  gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);

 

   YesResponse          = GetToken (STRING_TOKEN (ARE_YOU_SURE_YES), gHiiHandle);

   ASSERT (YesResponse != NULL);