2 files changed, 3 insertions, 11 deletions
diff --git a/EmulatorPkg/EmuGopDxe/GopInput.c b/EmulatorPkg/EmuGopDxe/GopInput.c
index 288a151d6d..a1f636aaa2 100644
--- a/EmulatorPkg/EmuGopDxe/GopInput.c
+++ b/EmulatorPkg/EmuGopDxe/GopInput.c
@@ -300,10 +300,6 @@ EmuGopSimpleTextInExResetEx (
 
 **/
 {
-  GOP_PRIVATE_DATA *Private;
-
-  Private = GOP_PRIVATE_DATA_FROM_TEXT_IN_EX_THIS (This);
-
   return EFI_SUCCESS;
 }
 
diff --git a/EmulatorPkg/EmuGopDxe/GopScreen.c b/EmulatorPkg/EmuGopDxe/GopScreen.c
index fff07d57fd..34ee6a5d52 100644
--- a/EmulatorPkg/EmuGopDxe/GopScreen.c
+++ b/EmulatorPkg/EmuGopDxe/GopScreen.c
@@ -1,6 +1,6 @@
 /*++ @file
 
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
 Portions copyright (c) 2010 - 2011, Apple Inc. All rights reserved.
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -368,11 +368,8 @@ EmuGopDestructor (
   GOP_PRIVATE_DATA     *Private
   )
 {
-  EFI_STATUS  Status;
-
-  Status = EFI_SUCCESS;
   if (!Private->HardwareNeedsStarting) {
-    Status = Private->EmuIoThunk->Close (Private->EmuIoThunk);
+    Private->EmuIoThunk->Close (Private->EmuIoThunk);
     Private->EmuGraphicsWindow = NULL;
   }
 
@@ -414,7 +411,6 @@ Returns:
 
 **/
 {
-  EFI_STATUS  Status;
-  Status = EmuGopDestructor (Context);
+  EmuGopDestructor (Context);
 }