Merge branch 'parisc-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux-2.6-microblaze.git] / drivers / infiniband / hw / vmw_pvrdma / pvrdma_srq.c

diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c
index 951d9d6..6cac0c8 100644 (file)
--- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c
+++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c
@@ -94,19 +94,18 @@ int pvrdma_query_srq(struct ib_srq *ibsrq, struct ib_srq_attr *srq_attr)
  * @init_attr: shared receive queue attributes
  * @udata: user data
  *
- * @return: the ib_srq pointer on success, otherwise returns an errno.
+ * @return: 0 on success, otherwise returns an errno.
  */
-struct ib_srq *pvrdma_create_srq(struct ib_pd *pd,
-                                struct ib_srq_init_attr *init_attr,
-                                struct ib_udata *udata)
+int pvrdma_create_srq(struct ib_srq *ibsrq, struct ib_srq_init_attr *init_attr,
+                     struct ib_udata *udata)
 {
-       struct pvrdma_srq *srq = NULL;
-       struct pvrdma_dev *dev = to_vdev(pd->device);
+       struct pvrdma_srq *srq = to_vsrq(ibsrq);
+       struct pvrdma_dev *dev = to_vdev(ibsrq->device);
        union pvrdma_cmd_req req;
        union pvrdma_cmd_resp rsp;
        struct pvrdma_cmd_create_srq *cmd = &req.create_srq;
        struct pvrdma_cmd_create_srq_resp *resp = &rsp.create_srq_resp;
-       struct pvrdma_create_srq_resp srq_resp = {0};
+       struct pvrdma_create_srq_resp srq_resp = {};
        struct pvrdma_create_srq ucmd;
        unsigned long flags;
        int ret;
@@ -115,31 +114,25 @@ struct ib_srq *pvrdma_create_srq(struct ib_pd *pd,
                /* No support for kernel clients. */
                dev_warn(&dev->pdev->dev,
                         "no shared receive queue support for kernel client\n");
-               return ERR_PTR(-EOPNOTSUPP);
+               return -EOPNOTSUPP;
        }
 
        if (init_attr->srq_type != IB_SRQT_BASIC) {
                dev_warn(&dev->pdev->dev,
                         "shared receive queue type %d not supported\n",
                         init_attr->srq_type);
-               return ERR_PTR(-EINVAL);
+               return -EINVAL;
        }
 
        if (init_attr->attr.max_wr  > dev->dsr->caps.max_srq_wr ||
            init_attr->attr.max_sge > dev->dsr->caps.max_srq_sge) {
                dev_warn(&dev->pdev->dev,
                         "shared receive queue size invalid\n");
-               return ERR_PTR(-EINVAL);
+               return -EINVAL;
        }
 
        if (!atomic_add_unless(&dev->num_srqs, 1, dev->dsr->caps.max_srq))
-               return ERR_PTR(-ENOMEM);
-
-       srq = kmalloc(sizeof(*srq), GFP_KERNEL);
-       if (!srq) {
-               ret = -ENOMEM;
-               goto err_srq;
-       }
+               return -ENOMEM;
 
        spin_lock_init(&srq->lock);
        refcount_set(&srq->refcnt, 1);
@@ -181,7 +174,7 @@ struct ib_srq *pvrdma_create_srq(struct ib_pd *pd,
        cmd->hdr.cmd = PVRDMA_CMD_CREATE_SRQ;
        cmd->srq_type = init_attr->srq_type;
        cmd->nchunks = srq->npages;
-       cmd->pd_handle = to_vpd(pd)->pd_handle;
+       cmd->pd_handle = to_vpd(ibsrq->pd)->pd_handle;
        cmd->attrs.max_wr = init_attr->attr.max_wr;
        cmd->attrs.max_sge = init_attr->attr.max_sge;
        cmd->attrs.srq_limit = init_attr->attr.srq_limit;
@@ -204,21 +197,20 @@ struct ib_srq *pvrdma_create_srq(struct ib_pd *pd,
        /* Copy udata back. */
        if (ib_copy_to_udata(udata, &srq_resp, sizeof(srq_resp))) {
                dev_warn(&dev->pdev->dev, "failed to copy back udata\n");
-               pvrdma_destroy_srq(&srq->ibsrq);
-               return ERR_PTR(-EINVAL);
+               pvrdma_destroy_srq(&srq->ibsrq, udata);
+               return -EINVAL;
        }
 
-       return &srq->ibsrq;
+       return 0;
 
 err_page_dir:
        pvrdma_page_dir_cleanup(dev, &srq->pdir);
 err_umem:
        ib_umem_release(srq->umem);
 err_srq:
-       kfree(srq);
        atomic_dec(&dev->num_srqs);
 
-       return ERR_PTR(ret);
+       return ret;
 }
 
 static void pvrdma_free_srq(struct pvrdma_dev *dev, struct pvrdma_srq *srq)
@@ -246,10 +238,11 @@ static void pvrdma_free_srq(struct pvrdma_dev *dev, struct pvrdma_srq *srq)
 /**
  * pvrdma_destroy_srq - destroy shared receive queue
  * @srq: the shared receive queue to destroy
+ * @udata: user data or null for kernel object
  *
  * @return: 0 for success.
  */
-int pvrdma_destroy_srq(struct ib_srq *srq)
+void pvrdma_destroy_srq(struct ib_srq *srq, struct ib_udata *udata)
 {
        struct pvrdma_srq *vsrq = to_vsrq(srq);
        union pvrdma_cmd_req req;
@@ -268,8 +261,6 @@ int pvrdma_destroy_srq(struct ib_srq *srq)
                         ret);
 
        pvrdma_free_srq(dev, vsrq);
-
-       return 0;
 }
 
 /**