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

Commit c0946642 authored by Dean Luick's avatar Dean Luick Committed by Doug Ledford
Browse files

IB/hfi1: Always expect ops functions 



Remove, insert, and invalidate are always provided.  No
need to test.

Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDean Luick <dean.luick@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 862548da

drivers/infiniband/hw/hfi1/mmu_rb.c

+6 −14
Original line number Diff line number Diff line
@@ -99,9 +99,6 @@ int hfi1_mmu_rb_register(struct rb_root *root, struct mmu_rb_ops *ops) 
{

	struct mmu_rb_handler *handlr;



	if (!ops->invalidate)

		return -EINVAL;



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

	if (!handlr)

		return -ENOMEM;
@@ -143,7 +140,6 @@ void hfi1_mmu_rb_unregister(struct rb_root *root) 
		while ((node = rb_first(root))) {

			rbnode = rb_entry(node, struct mmu_rb_node, node);

			rb_erase(node, root);

			if (handler->ops->remove)

			handler->ops->remove(root, rbnode, NULL);

		}

	}
@@ -172,11 +168,9 @@ int hfi1_mmu_rb_insert(struct rb_root *root, struct mmu_rb_node *mnode) 
	}

	__mmu_int_rb_insert(mnode, root);



	if (handler->ops->insert) {

	ret = handler->ops->insert(root, mnode);

	if (ret)

		__mmu_int_rb_remove(mnode, root);

	}

unlock:

	spin_unlock_irqrestore(&handler->lock, flags);

	return ret;
@@ -219,7 +213,6 @@ static void __mmu_rb_remove(struct mmu_rb_handler *handler, 
	__mmu_int_rb_remove(node, handler->root);

	spin_unlock_irqrestore(&handler->lock, flags);



	if (handler->ops->remove)

	handler->ops->remove(handler->root, node, mm);

}
@@ -300,7 +293,6 @@ static void mmu_notifier_mem_invalidate(struct mmu_notifier *mn, 
			  node->addr, node->len);

		if (handler->ops->invalidate(root, node)) {

			__mmu_int_rb_remove(node, root);

			if (handler->ops->remove)

			handler->ops->remove(root, node, mm);

		}

	}