From 455b7b66f784fb7f768ba1d85f04fe4cae50dcf1 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Fri, 18 Mar 2016 21:39:59 +0100 Subject: [PATCH] QuarkSocPkg: Spi/Common: remove set but unused variables Cc: Michael D Kinney Cc: Kelly Steele Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek Reviewed-by: Jordan Justen Reviewed-by: Jeff Fan --- .../QuarkNorthCluster/Spi/Common/SpiCommon.c | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/QuarkSocPkg/QuarkNorthCluster/Spi/Common/SpiCommon.c b/QuarkSocPkg/QuarkNorthCluster/Spi/Common/SpiCommon.c index e3d9b8f7de..3a14c9837d 100644 --- a/QuarkSocPkg/QuarkNorthCluster/Spi/Common/SpiCommon.c +++ b/QuarkSocPkg/QuarkNorthCluster/Spi/Common/SpiCommon.c @@ -165,14 +165,12 @@ Returns: EFI_STATUS Status; SPI_INSTANCE *SpiInstance; UINT8 SpiStatus; - UINTN PchRootComplexBar; if (UnlockCmdOpcodeIndex >= SPI_NUM_OPCODE) { return EFI_UNSUPPORTED; } SpiInstance = SPI_INSTANCE_FROM_SPIPROTOCOL (This); - PchRootComplexBar = SpiInstance->PchRootComplexBar; // // Issue unlock command to disable block protection, this only needs to be done once per SPI power on @@ -230,11 +228,8 @@ Returns: UINT8 Index; UINT16 OpcodeType; SPI_INSTANCE *SpiInstance; - BOOLEAN MultiPartitionIsSupported; UINTN PchRootComplexBar; - UINT8 SFDPCmdOpcodeIndex; UINT8 UnlockCmdOpcodeIndex; - UINT8 ReadDataCmdOpcodeIndex; UINT8 FlashPartId[3]; SpiInstance = SPI_INSTANCE_FROM_SPIPROTOCOL (This); @@ -302,8 +297,6 @@ Returns: // // Setup the Opcode Menu registers. // - ReadDataCmdOpcodeIndex = SPI_NUM_OPCODE; - SFDPCmdOpcodeIndex = SPI_NUM_OPCODE; UnlockCmdOpcodeIndex = SPI_NUM_OPCODE; for (Index = 0; Index < SPI_NUM_OPCODE; Index++) { MmioWrite8 ( @@ -334,23 +327,11 @@ Returns: } } - if (SpiInstance->SpiInitTable.OpcodeMenu[Index].Operation == EnumSpiOperationReadData || - SpiInstance->SpiInitTable.OpcodeMenu[Index].Operation == EnumSpiOperationFastRead || - SpiInstance->SpiInitTable.OpcodeMenu[Index].Operation == EnumSpiOperationDualOutputFastRead) { - ReadDataCmdOpcodeIndex = Index; - } - - if (SpiInstance->SpiInitTable.OpcodeMenu[Index].Operation == EnumSpiOperationDiscoveryParameters) { - SFDPCmdOpcodeIndex = Index; - } - if (SpiInstance->SpiInitTable.OpcodeMenu[Index].Operation == EnumSpiOperationWriteStatus) { UnlockCmdOpcodeIndex = Index; } } - MultiPartitionIsSupported = FALSE; - Status = UnlockFlashComponents ( This, UnlockCmdOpcodeIndex @@ -630,10 +611,8 @@ Returns: --*/ { SPI_INSTANCE *SpiInstance; - UINTN PchRootComplexBar; SpiInstance = SPI_INSTANCE_FROM_SPIPROTOCOL (This); - PchRootComplexBar = SpiInstance->PchRootComplexBar; if (SpiRegionType == EnumSpiRegionAll) { // @@ -714,13 +693,11 @@ Returns: UINTN LimitAddress; UINT32 SpiDataCount; UINT8 OpCode; - SPI_OPERATION Operation; UINTN PchRootComplexBar; SpiInstance = SPI_INSTANCE_FROM_SPIPROTOCOL (This); PchRootComplexBar = SpiInstance->PchRootComplexBar; SpiBiosSize = SpiInstance->SpiInitTable.BiosSize; - Operation = SpiInstance->SpiInitTable.OpcodeMenu[OpcodeIndex].Operation; OpCode = MmioRead8 (PchRootComplexBar + R_QNC_RCRB_SPIOPMENU + OpcodeIndex); // -- 2.39.2