From patchwork Thu Mar 24 10:37:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 64323 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp550033lbc; Thu, 24 Mar 2016 03:38:48 -0700 (PDT) X-Received: by 10.98.18.195 with SMTP id 64mr11479954pfs.131.1458815920855; Thu, 24 Mar 2016 03:38:40 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id h4si1221586pat.146.2016.03.24.03.38.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Mar 2016 03:38:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 99F6E1A1F72; Thu, 24 Mar 2016 03:38:35 -0700 (PDT) X-Original-To: edk2-devel@ml01.01.org Delivered-To: edk2-devel@ml01.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id ACEA51A1F72 for ; Thu, 24 Mar 2016 03:38:34 -0700 (PDT) Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 1B1B478222; Thu, 24 Mar 2016 10:38:09 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-113-47.phx2.redhat.com [10.3.113.47]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2OAbRfn032425; Thu, 24 Mar 2016 06:38:08 -0400 From: Laszlo Ersek To: edk2-devel-01 Date: Thu, 24 Mar 2016 11:37:15 +0100 Message-Id: <1458815844-24793-27-git-send-email-lersek@redhat.com> In-Reply-To: <1458815844-24793-1-git-send-email-lersek@redhat.com> References: <1458815844-24793-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Subject: [edk2] [PATCH 26/35] QuarkSocPkg: Spi/Common: remove set but unused variables X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Michael D Kinney MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Cc: Michael D Kinney Cc: Kelly Steele Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek --- QuarkSocPkg/QuarkNorthCluster/Spi/Common/SpiCommon.c | 23 -------------------- 1 file changed, 23 deletions(-) -- 1.8.3.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/QuarkSocPkg/QuarkNorthCluster/Spi/Common/SpiCommon.c b/QuarkSocPkg/QuarkNorthCluster/Spi/Common/SpiCommon.c index e3d9b8f7def3..3a14c9837d01 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); //