Vlv2TbltDevicePkg/PlatformSetupDxe: Remove the unused variables

Fix the following errors from gcc:

Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c: In function ?PrepareSetupInformation?:
Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c:540:31: error: variable ?EeState? set but not used [-Werror=unused-but-set-variable]
Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c:532:31: error: variable ?SrcDataSize? set but not used [-Werror=unused-but-set-variable]

Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c: In function ?UpdateAdditionalInformation?:
Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c:818:35: error: variable ?Size? set but not used [-Werror=unused-but-set-variable]
Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c:817:36: error: variable ?SystemManufacturer? set but not used [-Werror=unused-but-set-variable]

Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c: In function ?JudgeHandleIsPCIDevice?:
Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c:1094:22: error: variable ?DevicePath? set but not used [-Werror=unused-but-set-variable]

Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c: In function ?GetChipsetSataPortSpeed?:
Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c:1470:31: error: variable ?DwordReg? set but not used [-Werror=unused-but-set-variable]
Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c:1469:31: error: variable ?Status? 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>

diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c b/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
index 3c6f8f447cdb5207e532b3d05904e4b6369cb4b0..3cdb0132cd04217b6d8c5b6f707271f2c7a06b54 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
@@ -520,7 +520,6 @@ PrepareSetupInformation (
   EFI_DATA_HUB_PROTOCOL       *DataHub;\r
   EFI_DATA_RECORD_HEADER      *Record;\r
   UINT8                       *SrcData;\r
-  UINT32                      SrcDataSize;\r
   EFI_SUBCLASS_TYPE1_HEADER   *DataHeader;\r
   CHAR16                      *NewString;\r
   CHAR16                      *NewString2;\r
@@ -528,7 +527,6 @@ PrepareSetupInformation (
   STRING_REF                  TokenToUpdate;\r
   EFI_PROCESSOR_VERSION_DATA  *ProcessorVersion;\r
   UINTN                       Index;\r
-  UINT16                      EeState;\r
   UINTN                       DataOutput;\r
 \r
   EFI_PROCESSOR_MICROCODE_REVISION_DATA   *CpuUcodeRevisionData;\r
@@ -546,11 +544,6 @@ PrepareSetupInformation (
   SetMem(ReleaseDate, sizeof(ReleaseDate), 0);\r
   SetMem(ReleaseTime, sizeof(ReleaseTime), 0);\r
 \r
-  //\r
-  // Initialize EE state for not to show EE related setup options\r
-  //\r
-  EeState = 0;\r
-\r
   //\r
   // Get the Data Hub Protocol. Assume only one instance\r
   //\r
@@ -569,7 +562,6 @@ PrepareSetupInformation (
       if (Record->DataRecordClass == EFI_DATA_RECORD_CLASS_DATA) {\r
         DataHeader  = (EFI_SUBCLASS_TYPE1_HEADER *)(Record + 1);\r
         SrcData     = (UINT8  *)(DataHeader + 1);\r
-        SrcDataSize = Record->RecordSize - Record->HeaderSize - sizeof (EFI_SUBCLASS_TYPE1_HEADER);\r
 \r
         //\r
         // Processor\r
@@ -805,8 +797,6 @@ UpdateAdditionalInformation (
   EFI_DATA_HUB_PROTOCOL           *DataHub;\r
   EFI_DATA_RECORD_HEADER          *Record;\r
   EFI_SUBCLASS_TYPE1_HEADER       *DataHeader;\r
-  EFI_MISC_SYSTEM_MANUFACTURER    *SystemManufacturer;\r
-  UINTN                           Size;\r
   EFI_SMBIOS_PROTOCOL             *Smbios;\r
   EFI_SMBIOS_HANDLE               SmbiosHandle;\r
   EFI_SMBIOS_TABLE_HEADER         *SmbiosRecord;\r
@@ -816,6 +806,9 @@ UpdateAdditionalInformation (
   CHAR16                          *IfwiVersion = NULL;\r
   UINT16                          SearchIndex;\r
   EFI_STRING_ID                   TokenToUpdate;\r
+#if defined( RVP_SUPPORT ) && RVP_SUPPORT\r
+  EFI_MISC_SYSTEM_MANUFACTURER    *SystemManufacturer;\r
+#endif\r
 \r
   Status = gBS->LocateProtocol (\r
                   &gEfiDataHubProtocolGuid,\r
@@ -825,8 +818,6 @@ UpdateAdditionalInformation (
 \r
   ASSERT_EFI_ERROR(Status);\r
 \r
-  Size = 3;\r
-\r
   MonotonicCount  = 0;\r
   Record = NULL;\r
   do {\r
@@ -841,12 +832,12 @@ UpdateAdditionalInformation (
 \r
       if (CompareGuid(&Record->DataRecordGuid, &gEfiMiscSubClassGuid) &&\r
           (DataHeader->RecordType == EFI_MISC_SYSTEM_MANUFACTURER_RECORD_NUMBER)) {\r
+#if defined( RVP_SUPPORT ) && RVP_SUPPORT\r
         //\r
         // System Information\r
         //\r
         SystemManufacturer = (EFI_MISC_SYSTEM_MANUFACTURER *)(DataHeader + 1);\r
 \r
-#if defined( RVP_SUPPORT ) && RVP_SUPPORT\r
         //\r
         // UUID  (System Information)\r
         //\r
@@ -1082,7 +1073,6 @@ JudgeHandleIsPCIDevice(
 {\r
   EFI_STATUS  Status;\r
   EFI_DEVICE_PATH   *DPath;\r
-  EFI_DEVICE_PATH   *DevicePath;\r
 \r
   Status = gBS->HandleProtocol (\r
                   Handle,\r
@@ -1091,7 +1081,6 @@ JudgeHandleIsPCIDevice(
                   );\r
   if(!EFI_ERROR(Status))\r
   {\r
-    DevicePath = DPath;\r
     while(!IsDevicePathEnd(DPath))\r
     {\r
       if((DPath->Type == HARDWARE_DEVICE_PATH) && (DPath->SubType == HW_PCI_DP))\r
@@ -1457,9 +1446,6 @@ GetChipsetSataPortSpeed (
   UINT32                      IdeAhciBar;\r
   EFI_PHYSICAL_ADDRESS        MemBaseAddress = 0;\r
   UINT8                       FunNum;\r
-  EFI_STATUS                  Status;\r
-  UINT32                      DwordReg;\r
-\r
 \r
   DeviceSpeed = 0x01; // generation 1\r
 \r
@@ -1469,15 +1455,15 @@ GetChipsetSataPortSpeed (
   //\r
     FunNum = PCI_FUNCTION_NUMBER_PCH_SATA;\r
     MemBaseAddress = 0x0ffffffff;\r
-    Status = gDS->AllocateMemorySpace (\r
-                    EfiGcdAllocateMaxAddressSearchBottomUp,\r
-                    EfiGcdMemoryTypeMemoryMappedIo,\r
-                    N_PCH_SATA_ABAR_ALIGNMENT,  // 2^11: 2K Alignment\r
-                    V_PCH_SATA_ABAR_LENGTH,     // 2K Length\r
-                    &MemBaseAddress,\r
-                    mImageHandle,\r
-                    NULL\r
-                    );\r
+    gDS->AllocateMemorySpace (\r
+           EfiGcdAllocateMaxAddressSearchBottomUp,\r
+           EfiGcdMemoryTypeMemoryMappedIo,\r
+           N_PCH_SATA_ABAR_ALIGNMENT,  // 2^11: 2K Alignment\r
+           V_PCH_SATA_ABAR_LENGTH,     // 2K Length\r
+           &MemBaseAddress,\r
+           mImageHandle,\r
+           NULL\r
+           );\r
     IdeAhciBar = MmioRead32 (\r
                    MmPciAddress (\r
                                     0,\r
@@ -1507,7 +1493,6 @@ GetChipsetSataPortSpeed (
       // Program the "Ports Implemented Register"\r
       //\r
       MmioAndThenOr32 (IdeAhciBar + R_PCH_SATA_AHCI_PI, (UINT32)~(B_PCH_SATA_PORT0_IMPLEMENTED + B_PCH_SATA_PORT1_IMPLEMENTED), (UINT32)(B_PCH_SATA_PORT0_IMPLEMENTED + B_PCH_SATA_PORT1_IMPLEMENTED));\r
-      DwordReg = MmioRead32 (IdeAhciBar + R_PCH_SATA_AHCI_PI);\r
     }\r
 \r
     switch (PortNum)\r