IB/qib: Clean up register_ib_device

Remove some of the unnecessary code from qib_register_ib_device.

Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Harish Chegondi <harish.chegondi@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/qib/qib_verbs.c b/drivers/infiniband/hw/qib/qib_verbs.c
index 3785a526f2e92f0cd394d9009298e9aed482b4b0..0116f5814b9fd69a87e59dfa9383ac8457e496f4 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_verbs.c
+++ b/drivers/infiniband/hw/qib/qib_verbs.c
@@ -1703,81 +1703,15 @@ int qib_register_ib_device(struct qib_devdata *dd)
        strlcpy(ibdev->name, "qib%d", IB_DEVICE_NAME_MAX);
        ibdev->owner = THIS_MODULE;
        ibdev->node_guid = ppd->guid;
-       ibdev->uverbs_abi_ver = QIB_UVERBS_ABI_VERSION;
-       ibdev->uverbs_cmd_mask =
-               (1ull << IB_USER_VERBS_CMD_GET_CONTEXT)         |
-               (1ull << IB_USER_VERBS_CMD_QUERY_DEVICE)        |
-               (1ull << IB_USER_VERBS_CMD_QUERY_PORT)          |
-               (1ull << IB_USER_VERBS_CMD_ALLOC_PD)            |
-               (1ull << IB_USER_VERBS_CMD_DEALLOC_PD)          |
-               (1ull << IB_USER_VERBS_CMD_CREATE_AH)           |
-               (1ull << IB_USER_VERBS_CMD_MODIFY_AH)           |
-               (1ull << IB_USER_VERBS_CMD_QUERY_AH)            |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_AH)          |
-               (1ull << IB_USER_VERBS_CMD_REG_MR)              |
-               (1ull << IB_USER_VERBS_CMD_DEREG_MR)            |
-               (1ull << IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) |
-               (1ull << IB_USER_VERBS_CMD_CREATE_CQ)           |
-               (1ull << IB_USER_VERBS_CMD_RESIZE_CQ)           |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_CQ)          |
-               (1ull << IB_USER_VERBS_CMD_POLL_CQ)             |
-               (1ull << IB_USER_VERBS_CMD_REQ_NOTIFY_CQ)       |
-               (1ull << IB_USER_VERBS_CMD_CREATE_QP)           |
-               (1ull << IB_USER_VERBS_CMD_QUERY_QP)            |
-               (1ull << IB_USER_VERBS_CMD_MODIFY_QP)           |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_QP)          |
-               (1ull << IB_USER_VERBS_CMD_POST_SEND)           |
-               (1ull << IB_USER_VERBS_CMD_POST_RECV)           |
-               (1ull << IB_USER_VERBS_CMD_ATTACH_MCAST)        |
-               (1ull << IB_USER_VERBS_CMD_DETACH_MCAST)        |
-               (1ull << IB_USER_VERBS_CMD_CREATE_SRQ)          |
-               (1ull << IB_USER_VERBS_CMD_MODIFY_SRQ)          |
-               (1ull << IB_USER_VERBS_CMD_QUERY_SRQ)           |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_SRQ)         |
-               (1ull << IB_USER_VERBS_CMD_POST_SRQ_RECV);
-       ibdev->node_type = RDMA_NODE_IB_CA;
        ibdev->phys_port_cnt = dd->num_pports;
-       ibdev->num_comp_vectors = 1;
        ibdev->dma_device = &dd->pcidev->dev;
-       ibdev->query_device = NULL;
        ibdev->modify_device = qib_modify_device;
        ibdev->query_port = qib_query_port;
        ibdev->modify_port = qib_modify_port;
-       ibdev->query_pkey = NULL;
        ibdev->query_gid = qib_query_gid;
-       ibdev->alloc_ucontext = NULL;
-       ibdev->dealloc_ucontext = NULL;
-       ibdev->alloc_pd = NULL;
-       ibdev->dealloc_pd = NULL;
-       ibdev->create_ah = NULL;
-       ibdev->destroy_ah = NULL;
-       ibdev->modify_ah = NULL;
-       ibdev->query_ah = NULL;
-       ibdev->create_qp = NULL;
        ibdev->modify_qp = qib_modify_qp;
-       ibdev->query_qp = NULL;
        ibdev->destroy_qp = qib_destroy_qp;
-       ibdev->post_send = NULL;
-       ibdev->post_recv = NULL;
-       ibdev->create_cq = NULL;
-       ibdev->destroy_cq = NULL;
-       ibdev->resize_cq = NULL;
-       ibdev->poll_cq = NULL;
-       ibdev->req_notify_cq = NULL;
-       ibdev->get_dma_mr = NULL;
-       ibdev->reg_user_mr = NULL;
-       ibdev->dereg_mr = NULL;
-       ibdev->alloc_mr = NULL;
-       ibdev->map_mr_sg = NULL;
-       ibdev->alloc_fmr = NULL;
-       ibdev->map_phys_fmr = NULL;
-       ibdev->unmap_fmr = NULL;
-       ibdev->dealloc_fmr = NULL;
-       ibdev->attach_mcast = NULL;
-       ibdev->detach_mcast = NULL;
        ibdev->process_mad = qib_process_mad;
-       ibdev->mmap = NULL;
-       ibdev->dma_ops = NULL;
        ibdev->get_port_immutable = qib_port_immutable;
 
        snprintf(ibdev->node_desc, sizeof(ibdev->node_desc),
@@ -1799,8 +1733,6 @@ int qib_register_ib_device(struct qib_devdata *dd)
        dd->verbs_dev.rdi.driver_f.do_send = qib_do_send;
        dd->verbs_dev.rdi.driver_f.schedule_send = qib_schedule_send;
 
-       dd->verbs_dev.rdi.flags = 0;
-
        dd->verbs_dev.rdi.dparms.lkey_table_size = qib_lkey_table_size;
        dd->verbs_dev.rdi.dparms.qp_table_size = ib_qib_qp_table_size;
        dd->verbs_dev.rdi.dparms.qpn_start = 1;