Commit 018e6aff authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

nvme: remove ctrlr_get_pci_id transport callback 



The PCIe transport initializes the quirks directly, so the generic hook
to get PCI ID is no longer necessary.  This path was dead code.

Change-Id: I25bdaa598db53e4312a264d9d8356d1b416696e5
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent a384110d

lib/nvme/nvme_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -567,7 +567,6 @@ void nvme_qpair_print_completion(struct spdk_nvme_qpair *qpair, struct spdk_nvme 
	int nvme_ ## name ## _ctrlr_destruct(struct spdk_nvme_ctrlr *ctrlr); \

	int nvme_ ## name ## _ctrlr_scan(const struct spdk_nvme_transport_id *trid, void *cb_ctx, spdk_nvme_probe_cb probe_cb, spdk_nvme_remove_cb remove_cb); \

	int nvme_ ## name ## _ctrlr_enable(struct spdk_nvme_ctrlr *ctrlr); \

	int nvme_ ## name ## _ctrlr_get_pci_id(struct spdk_nvme_ctrlr *ctrlr, struct spdk_pci_id *pci_id); \

	int nvme_ ## name ## _ctrlr_set_reg_4(struct spdk_nvme_ctrlr *ctrlr, uint32_t offset, uint32_t value); \

	int nvme_ ## name ## _ctrlr_set_reg_8(struct spdk_nvme_ctrlr *ctrlr, uint32_t offset, uint64_t value); \

	int nvme_ ## name ## _ctrlr_get_reg_4(struct spdk_nvme_ctrlr *ctrlr, uint32_t offset, uint32_t *value); \

lib/nvme/nvme_pcie.c

+0 −13
Original line number Diff line number Diff line
@@ -293,19 +293,6 @@ nvme_pcie_qpair(struct spdk_nvme_qpair *qpair) 
	return (struct nvme_pcie_qpair *)((uintptr_t)qpair - offsetof(struct nvme_pcie_qpair, qpair));

}



int

nvme_pcie_ctrlr_get_pci_id(struct spdk_nvme_ctrlr *ctrlr, struct spdk_pci_id *pci_id)

{

	struct nvme_pcie_ctrlr *pctrlr = nvme_pcie_ctrlr(ctrlr);



	assert(ctrlr != NULL);

	assert(pci_id != NULL);



	*pci_id = spdk_pci_device_get_id(pctrlr->devhandle);



	return 0;

}



static volatile void *

nvme_pcie_reg_addr(struct spdk_nvme_ctrlr *ctrlr, uint32_t offset)

{

lib/nvme/nvme_rdma.c

+0 −6
Original line number Diff line number Diff line
@@ -1250,12 +1250,6 @@ nvme_rdma_ctrlr_destruct(struct spdk_nvme_ctrlr *ctrlr) 
	return 0;

}



int

nvme_rdma_ctrlr_get_pci_id(struct spdk_nvme_ctrlr *ctrlr, struct spdk_pci_id *pci_id)

{

	return -1;

}



int

nvme_rdma_ctrlr_set_reg_4(struct spdk_nvme_ctrlr *ctrlr, uint32_t offset, uint32_t value)

{

lib/nvme/nvme_transport.c

+0 −6
Original line number Diff line number Diff line
@@ -109,12 +109,6 @@ nvme_transport_ctrlr_enable(struct spdk_nvme_ctrlr *ctrlr) 
	NVME_TRANSPORT_CALL(ctrlr->trid.trtype, ctrlr_enable, (ctrlr));

}



int

nvme_transport_ctrlr_get_pci_id(struct spdk_nvme_ctrlr *ctrlr, struct spdk_pci_id *pci_id)

{

	NVME_TRANSPORT_CALL(ctrlr->trid.trtype, ctrlr_get_pci_id, (ctrlr, pci_id));

}



int

nvme_transport_ctrlr_set_reg_4(struct spdk_nvme_ctrlr *ctrlr, uint32_t offset, uint32_t value)

{

test/lib/nvme/unit/nvme_ctrlr_c/nvme_ctrlr_ut.c

+0 −10
Original line number Diff line number Diff line
@@ -75,16 +75,6 @@ nvme_transport_ctrlr_enable(struct spdk_nvme_ctrlr *ctrlr) 
	return 0;

}



int

nvme_transport_ctrlr_get_pci_id(struct spdk_nvme_ctrlr *ctrlr, struct spdk_pci_id *pci_id)

{

	if (ctrlr == NULL || pci_id == NULL) {

		return -EINVAL;

	}



	return 0;

}



int

nvme_transport_ctrlr_set_reg_4(struct spdk_nvme_ctrlr *ctrlr, uint32_t offset, uint32_t value)

{