diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-08-18 14:10:23 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-08-18 14:10:23 -0400 |
| commit | d3cf4d9915c4fb60aeef580973aa77420e600746 (patch) | |
| tree | 101f4c94eaa9d4c11673a41a7e5f2280fa59227d /drivers/nvme | |
| parent | 3e5f0881f17525e3b49835947a5e0cf2d681b1e2 (diff) | |
| parent | 9d6fd7aca149e2c95915447f76b125dc2123db45 (diff) | |
| download | op-kernel-dev-d3cf4d9915c4fb60aeef580973aa77420e600746.zip op-kernel-dev-d3cf4d9915c4fb60aeef580973aa77420e600746.tar.gz | |
Merge branch 'misc' into k.o/for-next
Conflicts:
drivers/infiniband/core/iwcm.c - The rdma_netlink patches in
HEAD and the iwarp cm workqueue fix (don't use WQ_MEM_RECLAIM,
we aren't safe for that context) touched the same code.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/rdma.c | 5 | ||||
| -rw-r--r-- | drivers/nvme/target/rdma.c | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 4e25acc..9fb6e4c 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1961,10 +1961,6 @@ static struct nvmf_transport_ops nvme_rdma_transport = { .create_ctrl = nvme_rdma_create_ctrl, }; -static void nvme_rdma_add_one(struct ib_device *ib_device) -{ -} - static void nvme_rdma_remove_one(struct ib_device *ib_device, void *client_data) { struct nvme_rdma_ctrl *ctrl; @@ -1986,7 +1982,6 @@ static void nvme_rdma_remove_one(struct ib_device *ib_device, void *client_data) static struct ib_client nvme_rdma_ib_client = { .name = "nvme_rdma", - .add = nvme_rdma_add_one, .remove = nvme_rdma_remove_one }; diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c index 56a4cba..76d2bb7 100644 --- a/drivers/nvme/target/rdma.c +++ b/drivers/nvme/target/rdma.c @@ -1510,10 +1510,6 @@ static struct nvmet_fabrics_ops nvmet_rdma_ops = { .delete_ctrl = nvmet_rdma_delete_ctrl, }; -static void nvmet_rdma_add_one(struct ib_device *ib_device) -{ -} - static void nvmet_rdma_remove_one(struct ib_device *ib_device, void *client_data) { struct nvmet_rdma_queue *queue; @@ -1534,7 +1530,6 @@ static void nvmet_rdma_remove_one(struct ib_device *ib_device, void *client_data static struct ib_client nvmet_rdma_ib_client = { .name = "nvmet_rdma", - .add = nvmet_rdma_add_one, .remove = nvmet_rdma_remove_one }; |
