Topics

[PATCH v2 12/19] Vlv2TbltDevicePkg/FvbRuntimeDxe: Remove unused variables


Gary Lin
 

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@...>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Gary Lin <glin@...>
---
Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c | 11 -----------
1 file changed, 11 deletions(-)

diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c
index 5c3d6dc..1cb5e9b 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,16 +433,10 @@ 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.
//
Attributes = FvbGetVolumeAttributes (Instance);
@@ -1016,7 +1007,6 @@ FvbInitialize (
UINTN TmpHeaderLength;
UINTN Idx;
UINT32 MaxLbaSize;
- BOOLEAN FvHeaderValid;
EFI_BOOT_MODE BootMode;
UINT32 PlatformFvBaseAddress[3];
UINT32 PlatformFvBaseAddressCount;
@@ -1072,7 +1062,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.9.2