mlx5: Move pci device handling from mlx5_ib to mlx5_core

[cascardo/linux.git] / drivers / infiniband / hw / mlx5 / srq.c

diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c
index 384af6d..70bd131 100644 (file)
--- a/drivers/infiniband/hw/mlx5/srq.c
+++ b/drivers/infiniband/hw/mlx5/srq.c
@@ -159,7 +159,7 @@ static int create_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq,
        int page_shift;
        int npages;
 
-       err = mlx5_db_alloc(&dev->mdev, &srq->db);
+       err = mlx5_db_alloc(dev->mdev, &srq->db);
        if (err) {
                mlx5_ib_warn(dev, "alloc dbell rec failed\n");
                return err;
@@ -167,7 +167,7 @@ static int create_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq,
 
        *srq->db.db = 0;
 
-       if (mlx5_buf_alloc(&dev->mdev, buf_size, PAGE_SIZE * 2, &srq->buf)) {
+       if (mlx5_buf_alloc(dev->mdev, buf_size, PAGE_SIZE * 2, &srq->buf)) {
                mlx5_ib_dbg(dev, "buf alloc failed\n");
                err = -ENOMEM;
                goto err_db;
@@ -212,10 +212,10 @@ err_in:
        mlx5_vfree(*in);
 
 err_buf:
-       mlx5_buf_free(&dev->mdev, &srq->buf);
+       mlx5_buf_free(dev->mdev, &srq->buf);
 
 err_db:
-       mlx5_db_free(&dev->mdev, &srq->db);
+       mlx5_db_free(dev->mdev, &srq->db);
        return err;
 }
 
@@ -229,8 +229,8 @@ static void destroy_srq_user(struct ib_pd *pd, struct mlx5_ib_srq *srq)
 static void destroy_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq)
 {
        kfree(srq->wrid);
-       mlx5_buf_free(&dev->mdev, &srq->buf);
-       mlx5_db_free(&dev->mdev, &srq->db);
+       mlx5_buf_free(dev->mdev, &srq->buf);
+       mlx5_db_free(dev->mdev, &srq->db);
 }
 
 struct ib_srq *mlx5_ib_create_srq(struct ib_pd *pd,
@@ -248,10 +248,10 @@ struct ib_srq *mlx5_ib_create_srq(struct ib_pd *pd,
        u32 flgs, xrcdn;
 
        /* Sanity check SRQ size before proceeding */
-       if (init_attr->attr.max_wr >= dev->mdev.caps.max_srq_wqes) {
+       if (init_attr->attr.max_wr >= dev->mdev->caps.max_srq_wqes) {
                mlx5_ib_dbg(dev, "max_wr %d, cap %d\n",
                            init_attr->attr.max_wr,
-                           dev->mdev.caps.max_srq_wqes);
+                           dev->mdev->caps.max_srq_wqes);
                return ERR_PTR(-EINVAL);
        }
 
@@ -303,7 +303,7 @@ struct ib_srq *mlx5_ib_create_srq(struct ib_pd *pd,
 
        in->ctx.pd = cpu_to_be32(to_mpd(pd)->pdn);
        in->ctx.db_record = cpu_to_be64(srq->db.dma);
-       err = mlx5_core_create_srq(&dev->mdev, &srq->msrq, in, inlen);
+       err = mlx5_core_create_srq(dev->mdev, &srq->msrq, in, inlen);
        mlx5_vfree(in);
        if (err) {
                mlx5_ib_dbg(dev, "create SRQ failed, err %d\n", err);
@@ -327,7 +327,7 @@ struct ib_srq *mlx5_ib_create_srq(struct ib_pd *pd,
        return &srq->ibsrq;
 
 err_core:
-       mlx5_core_destroy_srq(&dev->mdev, &srq->msrq);
+       mlx5_core_destroy_srq(dev->mdev, &srq->msrq);
 
 err_usr_kern_srq:
        if (pd->uobject)
@@ -357,7 +357,7 @@ int mlx5_ib_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
                        return -EINVAL;
 
                mutex_lock(&srq->mutex);
-               ret = mlx5_core_arm_srq(&dev->mdev, &srq->msrq, attr->srq_limit, 1);
+               ret = mlx5_core_arm_srq(dev->mdev, &srq->msrq, attr->srq_limit, 1);
                mutex_unlock(&srq->mutex);
 
                if (ret)
@@ -378,7 +378,7 @@ int mlx5_ib_query_srq(struct ib_srq *ibsrq, struct ib_srq_attr *srq_attr)
        if (!out)
                return -ENOMEM;
 
-       ret = mlx5_core_query_srq(&dev->mdev, &srq->msrq, out);
+       ret = mlx5_core_query_srq(dev->mdev, &srq->msrq, out);
        if (ret)
                goto out_box;
 
@@ -396,7 +396,7 @@ int mlx5_ib_destroy_srq(struct ib_srq *srq)
        struct mlx5_ib_dev *dev = to_mdev(srq->device);
        struct mlx5_ib_srq *msrq = to_msrq(srq);
 
-       mlx5_core_destroy_srq(&dev->mdev, &msrq->msrq);
+       mlx5_core_destroy_srq(dev->mdev, &msrq->msrq);
 
        if (srq->uobject) {
                mlx5_ib_db_unmap_user(to_mucontext(srq->uobject->context), &msrq->db);