From 0c5d4079789767ffabfdfe0d9767d9db348fa2c7 Mon Sep 17 00:00:00 2001
From: Lee Leahy <leroy.p.leahy@intel.com>
Date: Wed, 11 May 2016 16:08:27 -0700
Subject: [PATCH] QuarkPlatformPkg: Fix variable set but not used build errors

Fix variable set but not used errors detected by GCC 4.8.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Lee Leahy <leroy.p.leahy@intel.com>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>
---
 .../Acpi/DxeSmm/SmmPowerManagement/Ppm.c         | 16 ++--------------
 .../PlatformHelperLib/PlatformHelperPei.c        |  4 +---
 .../Platform/SpiFvbServices/FwBlockService.c     |  7 +------
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/QuarkPlatformPkg/Acpi/DxeSmm/SmmPowerManagement/Ppm.c b/QuarkPlatformPkg/Acpi/DxeSmm/SmmPowerManagement/Ppm.c
index 8f5e6a324c..4fb9ca1c6a 100644
--- a/QuarkPlatformPkg/Acpi/DxeSmm/SmmPowerManagement/Ppm.c
+++ b/QuarkPlatformPkg/Acpi/DxeSmm/SmmPowerManagement/Ppm.c
@@ -2,7 +2,7 @@
 
 Processor power management initialization code.
 
-Copyright (c) 2013-2015 Intel Corporation.
+Copyright (c) 2013-2016 Intel Corporation.
 
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -79,7 +79,6 @@ PpmPatchFadtTable (
   EFI_ACPI_TABLE_VERSION        Version;
   UINTN                         Index;
   UINTN                         Handle;
-  EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE  *FadtPointer;
 
   //
   // Scan all the acpi tables to find FADT 2.0
@@ -106,9 +105,7 @@ PpmPatchFadtTable (
   ASSERT (Table != NULL);
   CopyMem (Table, CurrentTable, CurrentTable->Length);
 
-  FadtPointer = (EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE*) Table;
-
-    //
+  //
   // Update the ACPI table and recalculate checksum
   //
   Status = mAcpiTable->UninstallAcpiTable (mAcpiTable, Handle);
@@ -322,7 +319,6 @@ PpmLoadAndPatchPMTables (
   UINTN                         TableHandle;
   UINT32                        FvStatus;
   UINTN                         Size;
-   EFI_ACPI_TABLE_VERSION       Version;
 
     Status = LocateSupportProtocol (&gEfiFirmwareVolume2ProtocolGuid, (VOID**)&FwVol, 1);
     if (EFI_ERROR (Status)) {
@@ -348,14 +344,6 @@ PpmLoadAndPatchPMTables (
                       );
 
     if (!EFI_ERROR(Status)) {
-        Version = EFI_ACPI_TABLE_VERSION_1_0B | EFI_ACPI_TABLE_VERSION_2_0 | EFI_ACPI_TABLE_VERSION_3_0;
-
-      if(((EFI_ACPI_DESCRIPTION_HEADER*) CurrentTable)->OemTableId == SIGNATURE_64 ('C', 'p', 'u', '0', 'I', 's', 't', 0)) {
-          Version = EFI_ACPI_TABLE_VERSION_NONE;
-      } else if(((EFI_ACPI_DESCRIPTION_HEADER*) CurrentTable)->OemTableId == SIGNATURE_64 ('C', 'p', 'u', '1', 'I', 's', 't', 0)) {
-          Version = EFI_ACPI_TABLE_VERSION_NONE;
-      }
-
       SsdtTableUpdate ((EFI_ACPI_DESCRIPTION_HEADER *) CurrentTable);
 
       //
diff --git a/QuarkPlatformPkg/Library/PlatformHelperLib/PlatformHelperPei.c b/QuarkPlatformPkg/Library/PlatformHelperLib/PlatformHelperPei.c
index 50a0e42743..c242c9ec95 100644
--- a/QuarkPlatformPkg/Library/PlatformHelperLib/PlatformHelperPei.c
+++ b/QuarkPlatformPkg/Library/PlatformHelperLib/PlatformHelperPei.c
@@ -1,7 +1,7 @@
 /** @file
 Implementation of Helper routines for PEI enviroment.
 
-Copyright (c) 2013-2015 Intel Corporation.
+Copyright (c) 2013-2016 Intel Corporation.
 
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -63,7 +63,6 @@ PlatformFindFvFileRawDataSection (
   EFI_SECTION_TYPE                  SearchType;
   EFI_FV_INFO                       VolumeInfo;
   EFI_FV_FILE_INFO                  FileInfo;
-  CONST EFI_PEI_SERVICES            **PeiServices;
 
   if (FileNameGuid == NULL || SectionData == NULL || SectionDataSize == NULL) {
     return EFI_INVALID_PARAMETER;
@@ -71,7 +70,6 @@ PlatformFindFvFileRawDataSection (
   *SectionData = NULL;
   *SectionDataSize = 0;
 
-  PeiServices = GetPeiServicesTablePointer ();
   SearchType = EFI_SECTION_RAW;
   for (Instance = 0; !EFI_ERROR((PeiServicesFfsFindNextVolume (Instance, &VolumeHandle))); Instance++) {
     if (FvNameGuid != NULL) {
diff --git a/QuarkPlatformPkg/Platform/SpiFvbServices/FwBlockService.c b/QuarkPlatformPkg/Platform/SpiFvbServices/FwBlockService.c
index 6cfe71028e..dbb5512f38 100644
--- a/QuarkPlatformPkg/Platform/SpiFvbServices/FwBlockService.c
+++ b/QuarkPlatformPkg/Platform/SpiFvbServices/FwBlockService.c
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2013-2015 Intel Corporation.
+Copyright (c) 2013-2016 Intel Corporation.
 
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -590,9 +590,6 @@ Returns:
 --*/
 {
   EFI_STATUS  Status;
-  UINTN       NumBytes;
-
-  NumBytes = LbaLength;
 
   WriteAddress -= (PcdGet32 (PcdFlashAreaBaseAddress));
   if (mInSmmMode == 0 ) { // !(EfiInManagementInterrupt ())) {
@@ -1638,7 +1635,6 @@ Returns:
   VOID                                *FirmwareVolumeHobList;
   UINT32                              BufferSize;
   EFI_FV_BLOCK_MAP_ENTRY              *PtrBlockMapEntry;
-  UINTN                               LbaAddress;
   BOOLEAN                             WriteEnabled;
   BOOLEAN                             WriteLocked;
   EFI_HANDLE                          FwbHandle;
@@ -1882,7 +1878,6 @@ Returns:
     FwhInstance->WriteEnabled             = WriteEnabled;
     EfiInitializeLock (&(FwhInstance->FvbDevLock), TPL_HIGH_LEVEL);
 
-    LbaAddress  = (UINTN) FwhInstance->FvWriteBase[0];
     NumOfBlocks = 0;
     WriteLocked = FALSE;