From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=shenglei.zhang@intel.com; receiver=edk2-devel@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 5401A210DF774 for ; Wed, 8 Aug 2018 01:47:31 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Aug 2018 01:47:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,456,1526367600"; d="scan'208";a="252946664" Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by fmsmga006.fm.intel.com with ESMTP; 08 Aug 2018 01:47:28 -0700 From: shenglei To: edk2-devel@lists.01.org Cc: Star Zeng , Eric Dong Date: Wed, 8 Aug 2018 16:46:51 +0800 Message-Id: <20180808084712.34696-6-shenglei.zhang@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20180808084712.34696-1-shenglei.zhang@intel.com> References: <20180808084712.34696-1-shenglei.zhang@intel.com> Subject: [PATCH 05/26] MdeModulePkg NvmExpressDxe: Remove redundant functions X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Aug 2018 08:47:31 -0000 The functions that are never called have been removed. They are ReadNvmeAdminSubmissionQueueBaseAddress, ReadNvmeAdminCompletionQueueBaseAddress and ReadNvmeAdminQueueAttributes https://bugzilla.tianocore.org/show_bug.cgi?id=1062 Cc: Star Zeng Cc: Eric Dong Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: shenglei --- .../Bus/Pci/NvmExpressDxe/NvmExpressHci.c | 110 ------------------ 1 file changed, 110 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c index 30ade3a589..421561f16d 100644 --- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c +++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c @@ -183,43 +183,7 @@ ReadNvmeControllerStatus ( return EFI_SUCCESS; } -/** - Read Nvm Express admin queue attributes register. - - @param Private The pointer to the NVME_CONTROLLER_PRIVATE_DATA data structure. - @param Aqa The buffer used to store admin queue attributes register content. - - @return EFI_SUCCESS Successfully read the admin queue attributes register content. - @return EFI_DEVICE_ERROR Fail to read the admin queue attributes register. - -**/ -EFI_STATUS -ReadNvmeAdminQueueAttributes ( - IN NVME_CONTROLLER_PRIVATE_DATA *Private, - IN NVME_AQA *Aqa - ) -{ - EFI_PCI_IO_PROTOCOL *PciIo; - EFI_STATUS Status; - UINT32 Data; - - PciIo = Private->PciIo; - Status = PciIo->Mem.Read ( - PciIo, - EfiPciIoWidthUint32, - NVME_BAR, - NVME_AQA_OFFSET, - 1, - &Data - ); - - if (EFI_ERROR(Status)) { - return Status; - } - WriteUnaligned32 ((UINT32*)Aqa, Data); - return EFI_SUCCESS; -} /** Write Nvm Express admin queue attributes register. @@ -262,43 +226,6 @@ WriteNvmeAdminQueueAttributes ( return EFI_SUCCESS; } -/** - Read Nvm Express admin submission queue base address register. - - @param Private The pointer to the NVME_CONTROLLER_PRIVATE_DATA data structure. - @param Asq The buffer used to store admin submission queue base address register content. - - @return EFI_SUCCESS Successfully read the admin submission queue base address register content. - @return EFI_DEVICE_ERROR Fail to read the admin submission queue base address register. - -**/ -EFI_STATUS -ReadNvmeAdminSubmissionQueueBaseAddress ( - IN NVME_CONTROLLER_PRIVATE_DATA *Private, - IN NVME_ASQ *Asq - ) -{ - EFI_PCI_IO_PROTOCOL *PciIo; - EFI_STATUS Status; - UINT64 Data; - - PciIo = Private->PciIo; - Status = PciIo->Mem.Read ( - PciIo, - EfiPciIoWidthUint32, - NVME_BAR, - NVME_ASQ_OFFSET, - 2, - &Data - ); - - if (EFI_ERROR(Status)) { - return Status; - } - - WriteUnaligned64 ((UINT64*)Asq, Data); - return EFI_SUCCESS; -} /** Write Nvm Express admin submission queue base address register. @@ -341,44 +268,7 @@ WriteNvmeAdminSubmissionQueueBaseAddress ( return EFI_SUCCESS; } -/** - Read Nvm Express admin completion queue base address register. - - @param Private The pointer to the NVME_CONTROLLER_PRIVATE_DATA data structure. - @param Acq The buffer used to store admin completion queue base address register content. - - @return EFI_SUCCESS Successfully read the admin completion queue base address register content. - @return EFI_DEVICE_ERROR Fail to read the admin completion queue base address register. - -**/ -EFI_STATUS -ReadNvmeAdminCompletionQueueBaseAddress ( - IN NVME_CONTROLLER_PRIVATE_DATA *Private, - IN NVME_ACQ *Acq - ) -{ - EFI_PCI_IO_PROTOCOL *PciIo; - EFI_STATUS Status; - UINT64 Data; - - PciIo = Private->PciIo; - Status = PciIo->Mem.Read ( - PciIo, - EfiPciIoWidthUint32, - NVME_BAR, - NVME_ACQ_OFFSET, - 2, - &Data - ); - - if (EFI_ERROR(Status)) { - return Status; - } - - WriteUnaligned64 ((UINT64*)Acq, Data); - return EFI_SUCCESS; -} /** Write Nvm Express admin completion queue base address register. -- 2.18.0.windows.1