Reviewed-by: Star Zeng <star.zeng@intel.com>
Cc Hao.
Thanks,
Star
-----Original Message-----
From: Zhang, Shenglei
Sent: Wednesday, August 8, 2018 4:47 PM
To: edk2-devel@lists.01.org
Cc: Zeng, Star <star.zeng@intel.com>; Dong, Eric <eric.dong@intel.com>
Subject: [PATCH 05/26] MdeModulePkg NvmExpressDxe: Remove redundant functions
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 <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei <shenglei.zhang@intel.com>
---
.../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
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel