From 88a727131517a1e4c0c7272ed7b805a726f5e0d5 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Fri, 3 Mar 2017 16:12:43 -0700 Subject: [PATCH] nvmf: combine set_aer_callback and attach Change-Id: Icb6aab97aa78862b19c1fa68fac2b7ac44feea90 Signed-off-by: Daniel Verkamp --- include/spdk/nvmf.h | 5 ----- lib/nvmf/direct.c | 11 +++-------- lib/nvmf/subsystem.c | 1 - lib/nvmf/virtual.c | 6 ------ 4 files changed, 3 insertions(+), 20 deletions(-) diff --git a/include/spdk/nvmf.h b/include/spdk/nvmf.h index 6694a2a06..8b314bbaf 100644 --- a/include/spdk/nvmf.h +++ b/include/spdk/nvmf.h @@ -89,11 +89,6 @@ struct spdk_nvmf_ctrlr_ops { */ int (*attach)(struct spdk_nvmf_subsystem *subsystem); - /** - * Set NVMe ctrlr AER. - */ - void (*set_aer_callback)(struct spdk_nvmf_subsystem *subsys); - /** * Get NVMe identify controller data. */ diff --git a/lib/nvmf/direct.c b/lib/nvmf/direct.c index a639d6317..8c08ec96a 100644 --- a/lib/nvmf/direct.c +++ b/lib/nvmf/direct.c @@ -270,19 +270,14 @@ nvmf_direct_ctrlr_attach(struct spdk_nvmf_subsystem *subsystem) return -1; } - return 0; -} + spdk_nvme_ctrlr_register_aer_callback(subsystem->dev.direct.ctrlr, + nvmf_direct_ctrlr_complete_aer, subsystem); -static void -nvmf_direct_ctrlr_set_aer_callback(struct spdk_nvmf_subsystem *subsys) -{ - spdk_nvme_ctrlr_register_aer_callback(subsys->dev.direct.ctrlr, - nvmf_direct_ctrlr_complete_aer, subsys); + return 0; } const struct spdk_nvmf_ctrlr_ops spdk_nvmf_direct_ctrlr_ops = { .attach = nvmf_direct_ctrlr_attach, - .set_aer_callback = nvmf_direct_ctrlr_set_aer_callback, .ctrlr_get_data = nvmf_direct_ctrlr_get_data, .process_admin_cmd = nvmf_direct_ctrlr_process_admin_cmd, .process_io_cmd = nvmf_direct_ctrlr_process_io_cmd, diff --git a/lib/nvmf/subsystem.c b/lib/nvmf/subsystem.c index 449a829ec..de952c6fc 100644 --- a/lib/nvmf/subsystem.c +++ b/lib/nvmf/subsystem.c @@ -316,7 +316,6 @@ nvmf_subsystem_add_ctrlr(struct spdk_nvmf_subsystem *subsystem, subsystem->dev.direct.ctrlr = ctrlr; subsystem->dev.direct.pci_addr = *pci_addr; - subsystem->ops->set_aer_callback(subsystem); return 0; } diff --git a/lib/nvmf/virtual.c b/lib/nvmf/virtual.c index 2674f9e0e..02407e286 100644 --- a/lib/nvmf/virtual.c +++ b/lib/nvmf/virtual.c @@ -556,14 +556,8 @@ nvmf_virtual_ctrlr_detach(struct spdk_nvmf_subsystem *subsystem) subsystem->dev.virt.ns_count = 0; } -static void -nvmf_virtual_ctrlr_set_aer_callback(struct spdk_nvmf_subsystem *subsys) -{ -} - const struct spdk_nvmf_ctrlr_ops spdk_nvmf_virtual_ctrlr_ops = { .attach = nvmf_virtual_ctrlr_attach, - .set_aer_callback = nvmf_virtual_ctrlr_set_aer_callback, .ctrlr_get_data = nvmf_virtual_ctrlr_get_data, .process_admin_cmd = nvmf_virtual_ctrlr_process_admin_cmd, .process_io_cmd = nvmf_virtual_ctrlr_process_io_cmd,