IB/qib: Delete QIB user context allocation and de-alloction functions

IB user context alloc and dealloc functions have been added to rdmavt.
Delete the QIB user context alloc/dealloc functions and use the ones in
rdmavt.

Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Harish Chegondi <harish.chegondi@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 2daca8f31ca2bd5d51da3860e0c0006809e33d0f..5d230c8def82dc4efade05a78afa3b3e68e869a6 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_verbs.c
+++ b/drivers/infiniband/hw/qib/qib_verbs.c
@@ -133,16 +133,6 @@ const int ib_qib_state_ops[IB_QPS_ERR + 1] = {
            QIB_POST_SEND_OK | QIB_FLUSH_SEND,
 };
 
-struct qib_ucontext {
-       struct ib_ucontext ibucontext;
-};
-
-static inline struct qib_ucontext *to_iucontext(struct ib_ucontext
-                                                 *ibucontext)
-{
-       return container_of(ibucontext, struct qib_ucontext, ibucontext);
-}
-
 /*
  * Translate ib_wr_opcode into ib_wc_opcode.
  */
@@ -1841,36 +1831,6 @@ unsigned qib_get_pkey(struct qib_ibport *ibp, unsigned index)
        return ret;
 }
 
-/**
- * qib_alloc_ucontext - allocate a ucontest
- * @ibdev: the infiniband device
- * @udata: not used by the QLogic_IB driver
- */
-
-static struct ib_ucontext *qib_alloc_ucontext(struct ib_device *ibdev,
-                                             struct ib_udata *udata)
-{
-       struct qib_ucontext *context;
-       struct ib_ucontext *ret;
-
-       context = kmalloc(sizeof(*context), GFP_KERNEL);
-       if (!context) {
-               ret = ERR_PTR(-ENOMEM);
-               goto bail;
-       }
-
-       ret = &context->ibucontext;
-
-bail:
-       return ret;
-}
-
-static int qib_dealloc_ucontext(struct ib_ucontext *context)
-{
-       kfree(to_iucontext(context));
-       return 0;
-}
-
 static void init_ibport(struct qib_pportdata *ppd)
 {
        struct qib_verbs_counters cntrs;
@@ -2062,8 +2022,8 @@ int qib_register_ib_device(struct qib_devdata *dd)
        ibdev->modify_port = qib_modify_port;
        ibdev->query_pkey = NULL;
        ibdev->query_gid = qib_query_gid;
-       ibdev->alloc_ucontext = qib_alloc_ucontext;
-       ibdev->dealloc_ucontext = qib_dealloc_ucontext;
+       ibdev->alloc_ucontext = NULL;
+       ibdev->dealloc_ucontext = NULL;
        ibdev->alloc_pd = NULL;
        ibdev->dealloc_pd = NULL;
        ibdev->create_ah = NULL;