From 460ae753b3a882f31e25b4bc4dc0571672e08e8c Mon Sep 17 00:00:00 2001 From: Gary Lin Date: Fri, 29 Jul 2016 11:25:34 +0800 Subject: Vlv2TbltDevicePkg/PlatformDxe: Remove the unused variables Fix the following errors from gcc: Vlv2TbltDevicePkg/PlatformDxe/Platform.c: In function ?InitPciDevPME?: Vlv2TbltDevicePkg/PlatformDxe/Platform.c:516:26: error: variable ?Status? set but not used [-Werror=unused-but-set-variable] Vlv2TbltDevicePkg/PlatformDxe/Platform.c: In function ?InitThermalZone?: Vlv2TbltDevicePkg/PlatformDxe/Platform.c:575:26: error: variable ?Status? set but not used [-Werror=unused-but-set-variable] Vlv2TbltDevicePkg/PlatformDxe/IchRegTable.c: In function ?InitializeSubsystemIds?: Vlv2TbltDevicePkg/PlatformDxe/IchRegTable.c:111:10: error: variable ?SubsystemAudioVidDid? set but not used [-Werror=unused-but-set-variable] Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c: In function ?InitBadBars?: Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c:115:40: error: variable ?PciIoDevice? set but not used [-Werror=unused-but-set-variable] Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c:114:39: error: variable ?Status? set but not used [-Werror=unused-but-set-variable] Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c: In function ?ProgramPciLatency?: Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c:320:39: error: variable ?Status? set but not used [-Werror=unused-but-set-variable] Cc: David Wei Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Gary Lin Reviewed-by: David Wei --- Vlv2TbltDevicePkg/PlatformDxe/IchRegTable.c | 2 - Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c | 214 ++++++++++++++-------------- Vlv2TbltDevicePkg/PlatformDxe/Platform.c | 40 +++--- 3 files changed, 123 insertions(+), 133 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformDxe/IchRegTable.c b/Vlv2TbltDevicePkg/PlatformDxe/IchRegTable.c index 06d325c39e..4569ce58d9 100644 --- a/Vlv2TbltDevicePkg/PlatformDxe/IchRegTable.c +++ b/Vlv2TbltDevicePkg/PlatformDxe/IchRegTable.c @@ -99,10 +99,8 @@ InitializeSubsystemIds ( EFI_REG_TABLE *RegTablePtr; UINT32 SubsystemVidDid; - UINT32 SubsystemAudioVidDid; SubsystemVidDid = mPlatformInfo.SsidSvid; - SubsystemAudioVidDid = mPlatformInfo.SsidSvid; RegTablePtr = mSubsystemIdRegs; diff --git a/Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c b/Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c index 16aaa18563..8c2bfff3c4 100644 --- a/Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c +++ b/Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c @@ -102,8 +102,6 @@ InitBadBars( ) { - EFI_STATUS Status; - PCI_IO_DEVICE *PciIoDevice; UINT64 BaseAddress = 0; UINT64 TempBaseAddress = 0; UINT8 RevId = 0; @@ -112,8 +110,6 @@ InitBadBars( UINT64 MemSize; UINTN MemSizeBits; - - PciIoDevice = PCI_IO_DEVICE_FROM_PCI_IO_THIS (PciIo); switch ( VendorId) { case ATI_VENDOR_ID: // @@ -124,31 +120,31 @@ InitBadBars( // // Get original BAR address // - Status = PciIo->Pci.Read ( - PciIo, - EfiPciIoWidthUint32, - Bar, - 1, - (VOID *) &BaseAddress - ); + PciIo->Pci.Read ( + PciIo, + EfiPciIoWidthUint32, + Bar, + 1, + (VOID *) &BaseAddress + ); // // Find BAR size // TempBaseAddress = 0xffffffff; - Status = PciIo->Pci.Write ( - PciIo, - EfiPciIoWidthUint32, - Bar, - 1, - (VOID *) &TempBaseAddress - ); - Status = PciIo->Pci.Read ( - PciIo, - EfiPciIoWidthUint32, - Bar, - 1, - (VOID *) &TempBaseAddress - ); + PciIo->Pci.Write ( + PciIo, + EfiPciIoWidthUint32, + Bar, + 1, + (VOID *) &TempBaseAddress + ); + PciIo->Pci.Read ( + PciIo, + EfiPciIoWidthUint32, + Bar, + 1, + (VOID *) &TempBaseAddress + ); TempBaseAddress &= 0xfffffffe; MemSize = 1; while ((TempBaseAddress & 0x01) == 0) { @@ -159,32 +155,32 @@ InitBadBars( // // Free up allocated memory memory and re-allocate with increased size. // - Status = gDS->FreeMemorySpace ( - BaseAddress, - MemSize - ); + gDS->FreeMemorySpace ( + BaseAddress, + MemSize + ); // // Force new alignment // MemSize = 0x8000000; MemSizeBits = 28; - Status = gDS->AllocateMemorySpace ( - EfiGcdAllocateAnySearchBottomUp, - EfiGcdMemoryTypeMemoryMappedIo, - MemSizeBits, // Alignment - MemSize, - &BaseAddress, - mImageHandle, - NULL - ); - Status = PciIo->Pci.Write ( - PciIo, - EfiPciIoWidthUint32, - Bar, - 1, - (VOID *) &BaseAddress - ); + gDS->AllocateMemorySpace ( + EfiGcdAllocateAnySearchBottomUp, + EfiGcdMemoryTypeMemoryMappedIo, + MemSizeBits, // Alignment + MemSize, + &BaseAddress, + mImageHandle, + NULL + ); + PciIo->Pci.Write ( + PciIo, + EfiPciIoWidthUint32, + Bar, + 1, + (VOID *) &BaseAddress + ); break; case NCR_VENDOR_ID: @@ -195,22 +191,22 @@ InitBadBars( // for (Bar = 0x10; Bar < 0x28; Bar+= 4) { - Status = PciIo->Pci.Read ( - PciIo, - EfiPciIoWidthUint32, - Bar, - 1, - (VOID *) &BaseAddress - ); + PciIo->Pci.Read ( + PciIo, + EfiPciIoWidthUint32, + Bar, + 1, + (VOID *) &BaseAddress + ); if (BaseAddress && 0x01) { TempBaseAddress = 0xffffffff; - Status = PciIo->Pci.Write ( - PciIo, - EfiPciIoWidthUint32, - Bar, - 1, - (VOID *) &TempBaseAddress - ); + PciIo->Pci.Write ( + PciIo, + EfiPciIoWidthUint32, + Bar, + 1, + (VOID *) &TempBaseAddress + ); TempBaseAddress &= 0xfffffffc; IoSize = 1; while ((TempBaseAddress & 0x01) == 0) { @@ -218,28 +214,28 @@ InitBadBars( IoSize = IoSize << 1; } if (IoSize < MIN_NCR_IO_SIZE) { - Status = gDS->FreeIoSpace ( - BaseAddress, - IoSize - ); - - Status = gDS->AllocateIoSpace ( - EfiGcdAllocateAnySearchTopDown, - EfiGcdIoTypeIo, - NCR_GRAN, // Alignment - MIN_NCR_IO_SIZE, - &BaseAddress, - mImageHandle, - NULL - ); + gDS->FreeIoSpace ( + BaseAddress, + IoSize + ); + + gDS->AllocateIoSpace ( + EfiGcdAllocateAnySearchTopDown, + EfiGcdIoTypeIo, + NCR_GRAN, // Alignment + MIN_NCR_IO_SIZE, + &BaseAddress, + mImageHandle, + NULL + ); TempBaseAddress = BaseAddress + 1; - Status = PciIo->Pci.Write ( - PciIo, - EfiPciIoWidthUint32, - Bar, - 1, - (VOID *) &TempBaseAddress - ); + PciIo->Pci.Write ( + PciIo, + EfiPciIoWidthUint32, + Bar, + 1, + (VOID *) &TempBaseAddress + ); } } } @@ -255,13 +251,13 @@ InitBadBars( // Controller. // All Tekoa A2 or earlier step chips for now. // - Status = PciIo->Pci.Read ( - PciIo, - EfiPciIoWidthUint8, - PCI_REVISION_ID_OFFSET, - 1, - &RevId - ); + PciIo->Pci.Read ( + PciIo, + EfiPciIoWidthUint8, + PCI_REVISION_ID_OFFSET, + 1, + &RevId + ); if (RevId <= 0x02) { for (Bar = 0x14; Bar < 0x24; Bar+= 4) { // @@ -269,13 +265,13 @@ InitBadBars( // Bars don't worry aboyut freeing up thge allocs. // TempBaseAddress = 0x0; - Status = PciIo->Pci.Write ( - PciIo, - EfiPciIoWidthUint32, - Bar, - 1, - (VOID *) &TempBaseAddress - ); + PciIo->Pci.Write ( + PciIo, + EfiPciIoWidthUint32, + Bar, + 1, + (VOID *) &TempBaseAddress + ); } // end for } else @@ -286,13 +282,13 @@ InitBadBars( //since Tekoa does not fully support IDE Bus Mastering // TempBaseAddress = 0x0; - Status = PciIo->Pci.Write ( - PciIo, - EfiPciIoWidthUint32, - 0x20, - 1, - (VOID *) &TempBaseAddress - ); + PciIo->Pci.Write ( + PciIo, + EfiPciIoWidthUint32, + 0x20, + 1, + (VOID *) &TempBaseAddress + ); } } break; @@ -308,19 +304,17 @@ ProgramPciLatency( IN EFI_PCI_IO_PROTOCOL *PciIo ) { - EFI_STATUS Status; - // // Program Master Latency Timer // if (mSystemConfiguration.PciLatency != 0) { - Status = PciIo->Pci.Write ( - PciIo, - EfiPciIoWidthUint8, - PCI_LATENCY_TIMER_OFFSET, - 1, - &mSystemConfiguration.PciLatency - ); + PciIo->Pci.Write ( + PciIo, + EfiPciIoWidthUint8, + PCI_LATENCY_TIMER_OFFSET, + 1, + &mSystemConfiguration.PciLatency + ); } return; } diff --git a/Vlv2TbltDevicePkg/PlatformDxe/Platform.c b/Vlv2TbltDevicePkg/PlatformDxe/Platform.c index 439b6d9229..3d8cbe0ed5 100644 --- a/Vlv2TbltDevicePkg/PlatformDxe/Platform.c +++ b/Vlv2TbltDevicePkg/PlatformDxe/Platform.c @@ -518,16 +518,15 @@ InitPciDevPME ( ) { UINTN VarSize; - EFI_STATUS Status; VarSize = sizeof(SYSTEM_CONFIGURATION); - Status = gRT->GetVariable( - NORMAL_SETUP_NAME, - &gEfiNormalSetupGuid, - NULL, - &VarSize, - &mSystemConfiguration - ); + gRT->GetVariable( + NORMAL_SETUP_NAME, + &gEfiNormalSetupGuid, + NULL, + &VarSize, + &mSystemConfiguration + ); // //Program HDA PME_EN @@ -577,21 +576,20 @@ InitThermalZone ( ) { UINTN VarSize; - EFI_STATUS Status; EFI_GLOBAL_NVS_AREA_PROTOCOL *GlobalNvsArea; VarSize = sizeof(SYSTEM_CONFIGURATION); - Status = gRT->GetVariable( - NORMAL_SETUP_NAME, - &gEfiNormalSetupGuid, - NULL, - &VarSize, - &mSystemConfiguration - ); - Status = gBS->LocateProtocol ( - &gEfiGlobalNvsAreaProtocolGuid, - NULL, - (void **)&GlobalNvsArea - ); + gRT->GetVariable( + NORMAL_SETUP_NAME, + &gEfiNormalSetupGuid, + NULL, + &VarSize, + &mSystemConfiguration + ); + gBS->LocateProtocol ( + &gEfiGlobalNvsAreaProtocolGuid, + NULL, + (void **)&GlobalNvsArea + ); GlobalNvsArea->Area->CriticalThermalTripPoint = mSystemConfiguration.CriticalThermalTripPoint; GlobalNvsArea->Area->PassiveThermalTripPoint = mSystemConfiguration.PassiveThermalTripPoint; } -- cgit v1.2.3