diff --git a/include/spdk/nvme.h b/include/spdk/nvme.h index 0151aae24..c46240910 100644 --- a/include/spdk/nvme.h +++ b/include/spdk/nvme.h @@ -2880,8 +2880,6 @@ struct spdk_nvme_transport_ops { int (*ctrlr_connect_qpair)(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair); - volatile struct spdk_nvme_registers *(*ctrlr_get_registers)(struct spdk_nvme_ctrlr *ctrlr); - void (*ctrlr_disconnect_qpair)(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair); void (*qpair_abort_reqs)(struct spdk_nvme_qpair *qpair, uint32_t dnr); diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c index 0079a7473..feec1dc93 100644 --- a/lib/nvme/nvme_ctrlr.c +++ b/lib/nvme/nvme_ctrlr.c @@ -86,12 +86,6 @@ nvme_ctrlr_get_cmbsz(struct spdk_nvme_ctrlr *ctrlr, union spdk_nvme_cmbsz_regist &cmbsz->raw); } -volatile struct spdk_nvme_registers * -spdk_nvme_ctrlr_get_registers(struct spdk_nvme_ctrlr *ctrlr) -{ - return nvme_transport_ctrlr_get_registers(ctrlr); -} - void spdk_nvme_ctrlr_get_default_ctrlr_opts(struct spdk_nvme_ctrlr_opts *opts, size_t opts_size) { diff --git a/lib/nvme/nvme_internal.h b/lib/nvme/nvme_internal.h index d458af2b6..a865bb2bb 100644 --- a/lib/nvme/nvme_internal.h +++ b/lib/nvme/nvme_internal.h @@ -1139,8 +1139,6 @@ struct spdk_nvme_qpair *nvme_transport_ctrlr_create_io_qpair(struct spdk_nvme_ct uint16_t qid, const struct spdk_nvme_io_qpair_opts *opts); void *nvme_transport_ctrlr_alloc_cmb_io_buffer(struct spdk_nvme_ctrlr *ctrlr, size_t size); int nvme_transport_ctrlr_free_cmb_io_buffer(struct spdk_nvme_ctrlr *ctrlr, void *buf, size_t size); -volatile struct spdk_nvme_registers *nvme_transport_ctrlr_get_registers( - struct spdk_nvme_ctrlr *ctrlr); int nvme_transport_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair); int nvme_transport_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, diff --git a/lib/nvme/nvme_pcie.c b/lib/nvme/nvme_pcie.c index 32aa667ea..386a7f6cc 100644 --- a/lib/nvme/nvme_pcie.c +++ b/lib/nvme/nvme_pcie.c @@ -600,14 +600,6 @@ nvme_pcie_ctrlr_alloc_cmb(struct spdk_nvme_ctrlr *ctrlr, uint64_t length, uint64 return 0; } -static volatile struct spdk_nvme_registers * -nvme_pcie_ctrlr_get_registers(struct spdk_nvme_ctrlr *ctrlr) -{ - struct nvme_pcie_ctrlr *pctrlr = nvme_pcie_ctrlr(ctrlr); - - return pctrlr->regs; -} - static void * nvme_pcie_ctrlr_alloc_cmb_io_buffer(struct spdk_nvme_ctrlr *ctrlr, size_t size) { @@ -2330,7 +2322,6 @@ const struct spdk_nvme_transport_ops pcie_ops = { .ctrlr_set_reg_8 = nvme_pcie_ctrlr_set_reg_8, .ctrlr_get_reg_4 = nvme_pcie_ctrlr_get_reg_4, .ctrlr_get_reg_8 = nvme_pcie_ctrlr_get_reg_8, - .ctrlr_get_registers = nvme_pcie_ctrlr_get_registers, .ctrlr_get_max_xfer_size = nvme_pcie_ctrlr_get_max_xfer_size, .ctrlr_get_max_sges = nvme_pcie_ctrlr_get_max_sges, diff --git a/lib/nvme/nvme_rdma.c b/lib/nvme/nvme_rdma.c index f9f3992e5..f266bc686 100644 --- a/lib/nvme/nvme_rdma.c +++ b/lib/nvme/nvme_rdma.c @@ -2097,12 +2097,6 @@ nvme_rdma_ctrlr_get_max_sges(struct spdk_nvme_ctrlr *ctrlr) return rctrlr->max_sge; } -static volatile struct spdk_nvme_registers * -nvme_rdma_ctrlr_get_registers(struct spdk_nvme_ctrlr *ctrlr) -{ - return NULL; -} - static void * nvme_rdma_ctrlr_alloc_cmb_io_buffer(struct spdk_nvme_ctrlr *ctrlr, size_t size) { @@ -2156,7 +2150,6 @@ const struct spdk_nvme_transport_ops rdma_ops = { .ctrlr_set_reg_8 = nvme_fabric_ctrlr_set_reg_8, .ctrlr_get_reg_4 = nvme_fabric_ctrlr_get_reg_4, .ctrlr_get_reg_8 = nvme_fabric_ctrlr_get_reg_8, - .ctrlr_get_registers = nvme_rdma_ctrlr_get_registers, .ctrlr_get_max_xfer_size = nvme_rdma_ctrlr_get_max_xfer_size, .ctrlr_get_max_sges = nvme_rdma_ctrlr_get_max_sges, diff --git a/lib/nvme/nvme_tcp.c b/lib/nvme/nvme_tcp.c index 898cdfe54..3eb44ca9d 100644 --- a/lib/nvme/nvme_tcp.c +++ b/lib/nvme/nvme_tcp.c @@ -1677,12 +1677,6 @@ nvme_tcp_ctrlr_get_max_sges(struct spdk_nvme_ctrlr *ctrlr) return 1; } -static volatile struct spdk_nvme_registers * -nvme_tcp_ctrlr_get_registers(struct spdk_nvme_ctrlr *ctrlr) -{ - return NULL; -} - static void * nvme_tcp_ctrlr_alloc_cmb_io_buffer(struct spdk_nvme_ctrlr *ctrlr, size_t size) { @@ -1730,7 +1724,6 @@ const struct spdk_nvme_transport_ops tcp_ops = { .ctrlr_set_reg_8 = nvme_fabric_ctrlr_set_reg_8, .ctrlr_get_reg_4 = nvme_fabric_ctrlr_get_reg_4, .ctrlr_get_reg_8 = nvme_fabric_ctrlr_get_reg_8, - .ctrlr_get_registers = nvme_tcp_ctrlr_get_registers, .ctrlr_get_max_xfer_size = nvme_tcp_ctrlr_get_max_xfer_size, .ctrlr_get_max_sges = nvme_tcp_ctrlr_get_max_sges, diff --git a/lib/nvme/nvme_transport.c b/lib/nvme/nvme_transport.c index 59c8662f6..073d19325 100644 --- a/lib/nvme/nvme_transport.c +++ b/lib/nvme/nvme_transport.c @@ -251,15 +251,6 @@ nvme_transport_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nv return transport->ops.ctrlr_connect_qpair(ctrlr, qpair); } -volatile struct spdk_nvme_registers * -nvme_transport_ctrlr_get_registers(struct spdk_nvme_ctrlr *ctrlr) -{ - const struct nvme_transport *transport = nvme_get_transport(ctrlr->trid.trstring); - - assert(transport != NULL); - return transport->ops.ctrlr_get_registers(ctrlr); -} - void nvme_transport_ctrlr_disconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair) {