[PATCH for-next] RDMA/siw: Cleanup unused mmap structures.

[PATCH for-next] RDMA/siw: Cleanup unused mmap structures.

[Bernard Metzler]

Removes obsolete driver specific mmap information after
generalization of RDMA driver mmap service. Also removes
useless forward declaration of struct siw_mr.

Fixes: 11f1a75567c4 ("RDMA/siw: Use the common mmap_xa helpers")
Signed-off-by: Bernard Metzler <bmt@zurich.ibm.com>
---
 drivers/infiniband/sw/siw/siw.h       | 11 -----------
 drivers/infiniband/sw/siw/siw_verbs.c |  2 --
 2 files changed, 13 deletions(-)

diff --git a/drivers/infiniband/sw/siw/siw.h b/drivers/infiniband/sw/siw/siw.h
index f851afb5632e..b939f489cd46 100644
--- a/drivers/infiniband/sw/siw/siw.h
+++ b/drivers/infiniband/sw/siw/siw.h
@@ -99,18 +99,9 @@ struct siw_device {
 	struct work_struct netdev_down;
 };
 
-struct siw_uobj {
-	void *addr;
-	u32 size;
-};
-
 struct siw_ucontext {
 	struct ib_ucontext base_ucontext;
 	struct siw_device *sdev;
-
-	/* xarray of user mappable objects */
-	struct xarray xa;
-	u32 uobj_nextkey;
 };
 
 /*
@@ -150,8 +141,6 @@ struct siw_pbl {
 	struct siw_pble pbe[1];
 };
 
-struct siw_mr;
-
 /*
  * Generic memory representation for registered siw memory.
  * Memory lookup always via higher 24 bit of STag (STag index).
diff --git a/drivers/infiniband/sw/siw/siw_verbs.c b/drivers/infiniband/sw/siw/siw_verbs.c
index 725985ed8af3..c992dd7299d9 100644
--- a/drivers/infiniband/sw/siw/siw_verbs.c
+++ b/drivers/infiniband/sw/siw/siw_verbs.c
@@ -87,8 +87,6 @@ int siw_alloc_ucontext(struct ib_ucontext *base_ctx, struct ib_udata *udata)
 		rv = -ENOMEM;
 		goto err_out;
 	}
-
-	ctx->uobj_nextkey = 0;
 	ctx->sdev = sdev;
 
 	uresp.dev_id = sdev->vendor_part_id;
-- 
2.17.2

Re: [PATCH for-next] RDMA/siw: Cleanup unused mmap structures.

[Jason Gunthorpe]

On Wed, Nov 13, 2019 at 04:34:04PM +0100, Bernard Metzler wrote:
> Removes obsolete driver specific mmap information after
> generalization of RDMA driver mmap service. Also removes
> useless forward declaration of struct siw_mr.
> 
> Fixes: 11f1a75567c4 ("RDMA/siw: Use the common mmap_xa helpers")
> Signed-off-by: Bernard Metzler <bmt@zurich.ibm.com>
> ---
>  drivers/infiniband/sw/siw/siw.h       | 11 -----------
>  drivers/infiniband/sw/siw/siw_verbs.c |  2 --
>  2 files changed, 13 deletions(-)

Applied to for-next, thanks

Jason