From e80cb37ee7b507b6cfe4e4b0f23dc4c5cb2c1d5d Mon Sep 17 00:00:00 2001
From: Gary Lin <glin@suse.com>
Date: Fri, 22 Jul 2016 17:47:12 +0800
Subject: [PATCH] Vlv2TbltDevicePkg/FvbRuntimeDxe: Remove unused variables
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Fix the following errors from gcc:

Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c: In function ‘FvbWriteBlock’:
Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c:368:44: error: variable ‘FwhInstance’ set but not used [-Werror=unused-but-set-variable]

Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c: In function ‘FvbEraseBlock’:
Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c:448:44: error: variable ‘FwhInstance’ set but not used [-Werror=unused-but-set-variable]

Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c: In function ‘FvbInitialize’:
Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c:1028:41: error: variable ‘FvHeaderValid’ set but not used [-Werror=unused-but-set-variable]

Cc: David Wei <david.wei@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Gary Lin <glin@suse.com>
---
 Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c
index 7c95c107e6..b0013f9183 100644
--- a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c
+++ b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c
@@ -356,12 +356,9 @@ FvbWriteBlock (
   EFI_FVB_ATTRIBUTES_2                    Attributes;
   UINTN                                   LbaAddress;
   UINTN                                   LbaLength;
-  EFI_FW_VOL_INSTANCE                     *FwhInstance;
   EFI_STATUS                              Status;
   EFI_STATUS                              Status1;
 
-  FwhInstance = GetFvbInstance (Instance);
-
   if ( (NumBytes == NULL) || (Buffer == NULL)) {
     return (EFI_INVALID_PARAMETER);
   }
@@ -436,15 +433,9 @@ FvbEraseBlock (
 {
   EFI_FVB_ATTRIBUTES_2                    Attributes;
   UINTN                                   LbaAddress;
-  EFI_FW_VOL_INSTANCE                     *FwhInstance;
   UINTN                                   LbaLength;
   EFI_STATUS                              Status;
 
-  //
-  // Find the right instance of the FVB private data.
-  //
-  FwhInstance = GetFvbInstance (Instance);
-
   //
   // Check if the FV is write enabled.
   //
@@ -1016,7 +1007,6 @@ FvbInitialize (
   UINTN                                 TmpHeaderLength;
   UINTN                                 Idx;
   UINT32                                MaxLbaSize;
-  BOOLEAN                               FvHeaderValid;
 
   //
   // Calculate the total size for all firmware volume block instances.
@@ -1043,7 +1033,6 @@ FvbInitialize (
     FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) BaseAddress;
 
     if (!IsFvHeaderValid (BaseAddress, FwVolHeader)) {
-      FvHeaderValid = FALSE;
       //
       // If not valid, get FvbInfo from the information carried in
       // FVB driver.
-- 
2.39.2