QuarkSocPkg: Spi/Common: remove set but unused variables

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Kelly Steele <kelly.steele@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>
This commit is contained in:
Laszlo Ersek 2016-03-18 21:39:59 +01:00
parent 0e283ad75f
commit 455b7b66f7

View File

@ -165,14 +165,12 @@ Returns:
EFI_STATUS Status; EFI_STATUS Status;
SPI_INSTANCE *SpiInstance; SPI_INSTANCE *SpiInstance;
UINT8 SpiStatus; UINT8 SpiStatus;
UINTN PchRootComplexBar;
if (UnlockCmdOpcodeIndex >= SPI_NUM_OPCODE) { if (UnlockCmdOpcodeIndex >= SPI_NUM_OPCODE) {
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
SpiInstance = SPI_INSTANCE_FROM_SPIPROTOCOL (This); 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 // 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; UINT8 Index;
UINT16 OpcodeType; UINT16 OpcodeType;
SPI_INSTANCE *SpiInstance; SPI_INSTANCE *SpiInstance;
BOOLEAN MultiPartitionIsSupported;
UINTN PchRootComplexBar; UINTN PchRootComplexBar;
UINT8 SFDPCmdOpcodeIndex;
UINT8 UnlockCmdOpcodeIndex; UINT8 UnlockCmdOpcodeIndex;
UINT8 ReadDataCmdOpcodeIndex;
UINT8 FlashPartId[3]; UINT8 FlashPartId[3];
SpiInstance = SPI_INSTANCE_FROM_SPIPROTOCOL (This); SpiInstance = SPI_INSTANCE_FROM_SPIPROTOCOL (This);
@ -302,8 +297,6 @@ Returns:
// //
// Setup the Opcode Menu registers. // Setup the Opcode Menu registers.
// //
ReadDataCmdOpcodeIndex = SPI_NUM_OPCODE;
SFDPCmdOpcodeIndex = SPI_NUM_OPCODE;
UnlockCmdOpcodeIndex = SPI_NUM_OPCODE; UnlockCmdOpcodeIndex = SPI_NUM_OPCODE;
for (Index = 0; Index < SPI_NUM_OPCODE; Index++) { for (Index = 0; Index < SPI_NUM_OPCODE; Index++) {
MmioWrite8 ( 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) { if (SpiInstance->SpiInitTable.OpcodeMenu[Index].Operation == EnumSpiOperationWriteStatus) {
UnlockCmdOpcodeIndex = Index; UnlockCmdOpcodeIndex = Index;
} }
} }
MultiPartitionIsSupported = FALSE;
Status = UnlockFlashComponents ( Status = UnlockFlashComponents (
This, This,
UnlockCmdOpcodeIndex UnlockCmdOpcodeIndex
@ -630,10 +611,8 @@ Returns:
--*/ --*/
{ {
SPI_INSTANCE *SpiInstance; SPI_INSTANCE *SpiInstance;
UINTN PchRootComplexBar;
SpiInstance = SPI_INSTANCE_FROM_SPIPROTOCOL (This); SpiInstance = SPI_INSTANCE_FROM_SPIPROTOCOL (This);
PchRootComplexBar = SpiInstance->PchRootComplexBar;
if (SpiRegionType == EnumSpiRegionAll) { if (SpiRegionType == EnumSpiRegionAll) {
// //
@ -714,13 +693,11 @@ Returns:
UINTN LimitAddress; UINTN LimitAddress;
UINT32 SpiDataCount; UINT32 SpiDataCount;
UINT8 OpCode; UINT8 OpCode;
SPI_OPERATION Operation;
UINTN PchRootComplexBar; UINTN PchRootComplexBar;
SpiInstance = SPI_INSTANCE_FROM_SPIPROTOCOL (This); SpiInstance = SPI_INSTANCE_FROM_SPIPROTOCOL (This);
PchRootComplexBar = SpiInstance->PchRootComplexBar; PchRootComplexBar = SpiInstance->PchRootComplexBar;
SpiBiosSize = SpiInstance->SpiInitTable.BiosSize; SpiBiosSize = SpiInstance->SpiInitTable.BiosSize;
Operation = SpiInstance->SpiInitTable.OpcodeMenu[OpcodeIndex].Operation;
OpCode = MmioRead8 (PchRootComplexBar + R_QNC_RCRB_SPIOPMENU + OpcodeIndex); OpCode = MmioRead8 (PchRootComplexBar + R_QNC_RCRB_SPIOPMENU + OpcodeIndex);
// //