From f80c0f4fdd0b626fa83eeb790c3d796f30a780d6 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Thu, 5 Jan 2017 16:14:34 -0700 Subject: [PATCH] nvme: remove transport ctrlr_attach callback Now that the hotplug code is isolated in nvme_pcie.c, it can call the PCIe transport attach function directly. Change-Id: I2df3b9168473b537cc9b13367e06d3d3b6fa22be Signed-off-by: Daniel Verkamp --- lib/nvme/nvme_internal.h | 1 - lib/nvme/nvme_pcie.c | 10 +++++----- lib/nvme/nvme_rdma.c | 9 --------- lib/nvme/nvme_transport.c | 8 -------- test/lib/nvme/unit/nvme_c/nvme_ut.c | 8 -------- test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut.c | 8 -------- 6 files changed, 5 insertions(+), 39 deletions(-) diff --git a/lib/nvme/nvme_internal.h b/lib/nvme/nvme_internal.h index 803716b030..91a674eb77 100644 --- a/lib/nvme/nvme_internal.h +++ b/lib/nvme/nvme_internal.h @@ -567,7 +567,6 @@ void nvme_qpair_print_completion(struct spdk_nvme_qpair *qpair, struct spdk_nvme void *devhandle); \ 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_attach(enum spdk_nvme_transport_type trtype, spdk_nvme_probe_cb probe_cb, void *cb_ctx, struct spdk_pci_addr *addr); \ 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); \ diff --git a/lib/nvme/nvme_pcie.c b/lib/nvme/nvme_pcie.c index 0393a21fc4..5dae16a0b0 100644 --- a/lib/nvme/nvme_pcie.c +++ b/lib/nvme/nvme_pcie.c @@ -183,6 +183,8 @@ struct nvme_pcie_qpair { uint64_t cpl_bus_addr; }; +static int nvme_pcie_ctrlr_attach(spdk_nvme_probe_cb probe_cb, void *cb_ctx, + struct spdk_pci_addr *pci_addr); static int nvme_pcie_qpair_construct(struct spdk_nvme_qpair *qpair); static int nvme_pcie_qpair_destroy(struct spdk_nvme_qpair *qpair); @@ -245,7 +247,7 @@ _nvme_pcie_hotplug_monitor(void *cb_ctx, spdk_nvme_probe_cb probe_cb, event.traddr); if (spdk_process_is_primary()) { if (!spdk_pci_addr_parse(&pci_addr, event.traddr)) { - nvme_transport_ctrlr_attach(SPDK_NVME_TRANSPORT_PCIE, probe_cb, cb_ctx, &pci_addr); + nvme_pcie_ctrlr_attach(probe_cb, cb_ctx, &pci_addr); } } } else if (event.action == SPDK_NVME_UEVENT_REMOVE) { @@ -641,10 +643,8 @@ nvme_pcie_ctrlr_scan(const struct spdk_nvme_transport_id *trid, return spdk_pci_nvme_enumerate(pcie_nvme_enum_cb, &enum_ctx); } -int -nvme_pcie_ctrlr_attach(enum spdk_nvme_transport_type trtype, - spdk_nvme_probe_cb probe_cb, void *cb_ctx, - struct spdk_pci_addr *pci_addr) +static int +nvme_pcie_ctrlr_attach(spdk_nvme_probe_cb probe_cb, void *cb_ctx, struct spdk_pci_addr *pci_addr) { struct nvme_pcie_enum_ctx enum_ctx; diff --git a/lib/nvme/nvme_rdma.c b/lib/nvme/nvme_rdma.c index a58ec46d0a..64df4f18e5 100644 --- a/lib/nvme/nvme_rdma.c +++ b/lib/nvme/nvme_rdma.c @@ -1123,15 +1123,6 @@ nvme_rdma_ctrlr_scan(const struct spdk_nvme_transport_id *discovery_trid, return 0; } -int -nvme_rdma_ctrlr_attach(enum spdk_nvme_transport_type trtype, - spdk_nvme_probe_cb probe_cb, void *cb_ctx, - struct spdk_pci_addr *addr) -{ - /* Not implemented yet */ - return -1; -} - struct spdk_nvme_ctrlr *nvme_rdma_ctrlr_construct(const struct spdk_nvme_transport_id *trid, const struct spdk_nvme_ctrlr_opts *opts, void *devhandle) diff --git a/lib/nvme/nvme_transport.c b/lib/nvme/nvme_transport.c index a5a856cbf1..3624de1aed 100644 --- a/lib/nvme/nvme_transport.c +++ b/lib/nvme/nvme_transport.c @@ -97,14 +97,6 @@ nvme_transport_ctrlr_scan(const struct spdk_nvme_transport_id *trid, NVME_TRANSPORT_CALL(trid->trtype, ctrlr_scan, (trid, cb_ctx, probe_cb, remove_cb)); } -int -nvme_transport_ctrlr_attach(enum spdk_nvme_transport_type trtype, - spdk_nvme_probe_cb probe_cb, void *cb_ctx, - struct spdk_pci_addr *addr) -{ - NVME_TRANSPORT_CALL(trtype, ctrlr_attach, (trtype, probe_cb, cb_ctx, addr)); -} - int nvme_transport_ctrlr_destruct(struct spdk_nvme_ctrlr *ctrlr) { diff --git a/test/lib/nvme/unit/nvme_c/nvme_ut.c b/test/lib/nvme/unit/nvme_c/nvme_ut.c index 3c5c77b0ac..9cc44aa093 100644 --- a/test/lib/nvme/unit/nvme_c/nvme_ut.c +++ b/test/lib/nvme/unit/nvme_c/nvme_ut.c @@ -77,14 +77,6 @@ nvme_transport_ctrlr_scan(const struct spdk_nvme_transport_id *trid, return 0; } -int -nvme_transport_ctrlr_attach(enum spdk_nvme_transport_type trtype, - spdk_nvme_probe_cb probe_cb, void *cb_ctx, - struct spdk_pci_addr *addr) -{ - return 0; -} - void nvme_ctrlr_destruct(struct spdk_nvme_ctrlr *ctrlr) { diff --git a/test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut.c b/test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut.c index 9352c8a395..fc7d4fc555 100644 --- a/test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut.c +++ b/test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut.c @@ -180,14 +180,6 @@ nvme_transport_ctrlr_scan(const struct spdk_nvme_transport_id *trid, return 0; } -int -nvme_transport_ctrlr_attach(enum spdk_nvme_transport_type trtype, - spdk_nvme_probe_cb probe_cb, void *cb_ctx, - struct spdk_pci_addr *addr) -{ - return 0; -} - static void prepare_for_test(struct spdk_nvme_ns *ns, struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair,