Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8718e2e authored by Mitko Haralanov's avatar Mitko Haralanov Committed by Doug Ledford
Browse files

IB/hfi1: Remove compare callback 



Interval RB trees provide their own searching function,
which also takes care of determining the path through
the tree that should be taken.

This make the compare callback unnecessary.

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: default avatarDean Luick <dean.luick@intel.com>
Signed-off-by: default avatarMitko Haralanov <mitko.haralanov@intel.com>
Signed-off-by: default avatarJubin John <jubin.john@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 353b71c7

drivers/staging/rdma/hfi1/mmu_rb.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ int hfi1_mmu_rb_register(struct rb_root *root, struct mmu_rb_ops *ops) 
	struct mmu_rb_handler *handlr;

	unsigned long flags;



	if (!ops->compare || !ops->invalidate)

	if (!ops->invalidate)

		return -EINVAL;



	handlr = kmalloc(sizeof(*handlr), GFP_KERNEL);

drivers/staging/rdma/hfi1/mmu_rb.h

+0 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ struct mmu_rb_node { 
};



struct mmu_rb_ops {

	int (*compare)(struct mmu_rb_node *, unsigned long,

		       unsigned long);

	int (*insert)(struct rb_root *, struct mmu_rb_node *);

	void (*remove)(struct rb_root *, struct mmu_rb_node *, bool);

	int (*invalidate)(struct rb_root *, struct mmu_rb_node *);

drivers/staging/rdma/hfi1/user_exp_rcv.c

+0 −14
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ static void unlock_exp_tids(struct hfi1_ctxtdata *, struct exp_tid_set *, 
static u32 find_phys_blocks(struct page **, unsigned, struct tid_pageset *);

static int set_rcvarray_entry(struct file *, unsigned long, u32,

			      struct tid_group *, struct page **, unsigned);

static inline int mmu_addr_cmp(struct mmu_rb_node *, unsigned long,

			       unsigned long);

static int mmu_rb_insert(struct rb_root *, struct mmu_rb_node *);

static void mmu_rb_remove(struct rb_root *, struct mmu_rb_node *, bool);

static int mmu_rb_invalidate(struct rb_root *, struct mmu_rb_node *);
@@ -98,7 +96,6 @@ static int unprogram_rcvarray(struct file *, u32, struct tid_group **); 
static void clear_tid_node(struct hfi1_filedata *, u16, struct tid_rb_node *);



static struct mmu_rb_ops tid_rb_ops = {

	.compare = mmu_addr_cmp,

	.insert = mmu_rb_insert,

	.remove = mmu_rb_remove,

	.invalidate = mmu_rb_invalidate
@@ -1016,17 +1013,6 @@ static int mmu_rb_invalidate(struct rb_root *root, struct mmu_rb_node *mnode) 
	return 0;

}



static int mmu_addr_cmp(struct mmu_rb_node *node, unsigned long addr,

			unsigned long len)

{

	if ((addr + len) <= node->addr)

		return -1;

	else if (addr >= node->addr && addr < (node->addr + node->len))

		return 0;

	else

		return 1;

}



static int mmu_rb_insert(struct rb_root *root, struct mmu_rb_node *node)

{

	struct hfi1_filedata *fdata =