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

Commit dcc9881e authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Doug Ledford
Browse files

RDMA/(core, ulp): Convert register/unregister event handler to be void 



The functions ib_register_event_handler() and
ib_unregister_event_handler() always returned success and they can't fail.

Let's convert those functions to be void, remove redundant checks and
cleanup tons of goto statements.

Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 55f2467c

drivers/infiniband/core/cache.c

+8 −15
Original line number Diff line number Diff line
@@ -1199,30 +1199,23 @@ int ib_cache_setup_one(struct ib_device *device) 
	device->cache.ports =

		kzalloc(sizeof(*device->cache.ports) *

			(rdma_end_port(device) - rdma_start_port(device) + 1), GFP_KERNEL);

	if (!device->cache.ports) {

		err = -ENOMEM;

		goto out;

	}

	if (!device->cache.ports)

		return -ENOMEM;



	err = gid_table_setup_one(device);

	if (err)

		goto out;

	if (err) {

		kfree(device->cache.ports);

		device->cache.ports = NULL;

		return err;

	}



	for (p = 0; p <= rdma_end_port(device) - rdma_start_port(device); ++p)

		ib_cache_update(device, p + rdma_start_port(device), true);



	INIT_IB_EVENT_HANDLER(&device->cache.event_handler,

			      device, ib_cache_event);

	err = ib_register_event_handler(&device->cache.event_handler);

	if (err)

		goto err;



	ib_register_event_handler(&device->cache.event_handler);

	return 0;



err:

	gid_table_cleanup_one(device);

out:

	return err;

}



void ib_cache_release_one(struct ib_device *device)

drivers/infiniband/core/device.c

+2 −6
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ EXPORT_SYMBOL(ib_set_client_data); 
 * chapter 11 of the InfiniBand Architecture Specification).  This

 * callback may occur in interrupt context.

 */

int ib_register_event_handler  (struct ib_event_handler *event_handler)

void ib_register_event_handler(struct ib_event_handler *event_handler)

{

	unsigned long flags;
@@ -755,8 +755,6 @@ int ib_register_event_handler (struct ib_event_handler *event_handler) 
	list_add_tail(&event_handler->list,

		      &event_handler->device->event_handler_list);

	spin_unlock_irqrestore(&event_handler->device->event_handler_lock, flags);



	return 0;

}

EXPORT_SYMBOL(ib_register_event_handler);
@@ -767,15 +765,13 @@ EXPORT_SYMBOL(ib_register_event_handler); 
 * Unregister an event handler registered with

 * ib_register_event_handler().

 */

int ib_unregister_event_handler(struct ib_event_handler *event_handler)

void ib_unregister_event_handler(struct ib_event_handler *event_handler)

{

	unsigned long flags;



	spin_lock_irqsave(&event_handler->device->event_handler_lock, flags);

	list_del(&event_handler->list);

	spin_unlock_irqrestore(&event_handler->device->event_handler_lock, flags);



	return 0;

}

EXPORT_SYMBOL(ib_unregister_event_handler);

drivers/infiniband/core/sa_query.c

+1 −2
Original line number Diff line number Diff line
@@ -2417,8 +2417,7 @@ static void ib_sa_add_one(struct ib_device *device) 
	 */



	INIT_IB_EVENT_HANDLER(&sa_dev->event_handler, device, ib_sa_event);

	if (ib_register_event_handler(&sa_dev->event_handler))

		goto err;

	ib_register_event_handler(&sa_dev->event_handler);



	for (i = 0; i <= e - s; ++i) {

		if (rdma_cap_ib_sa(device, i + 1))

drivers/infiniband/core/uverbs_main.c

+1 −12
Original line number Diff line number Diff line
@@ -595,7 +595,6 @@ struct file *ib_uverbs_alloc_async_event_file(struct ib_uverbs_file *uverbs_file 
{

	struct ib_uverbs_async_event_file *ev_file;

	struct file *filp;

	int ret;



	ev_file = kzalloc(sizeof(*ev_file), GFP_KERNEL);

	if (!ev_file)
@@ -621,21 +620,11 @@ struct file *ib_uverbs_alloc_async_event_file(struct ib_uverbs_file *uverbs_file 
	INIT_IB_EVENT_HANDLER(&uverbs_file->event_handler,

			      ib_dev,

			      ib_uverbs_event_handler);

	ret = ib_register_event_handler(&uverbs_file->event_handler);

	if (ret)

		goto err_put_file;



	ib_register_event_handler(&uverbs_file->event_handler);

	/* At that point async file stuff was fully set */



	return filp;



err_put_file:

	fput(filp);

	kref_put(&uverbs_file->async_file->ref,

		 ib_uverbs_release_async_event_file);

	uverbs_file->async_file = NULL;

	return ERR_PTR(ret);



err_put_refs:

	kref_put(&ev_file->uverbs_file->ref, ib_uverbs_release_file);

	kref_put(&ev_file->ref, ib_uverbs_release_async_event_file);

drivers/infiniband/ulp/ipoib/ipoib_main.c

+1 −9
Original line number Diff line number Diff line
@@ -2227,13 +2227,7 @@ static struct net_device *ipoib_add_port(const char *format, 


	INIT_IB_EVENT_HANDLER(&priv->event_handler,

			      priv->ca, ipoib_event);

	result = ib_register_event_handler(&priv->event_handler);

	if (result < 0) {

		printk(KERN_WARNING "%s: ib_register_event_handler failed for "

		       "port %d (ret = %d)\n",

		       hca->name, port, result);

		goto event_failed;

	}

	ib_register_event_handler(&priv->event_handler);



	result = register_netdev(priv->dev);

	if (result) {
@@ -2266,8 +2260,6 @@ static struct net_device *ipoib_add_port(const char *format, 
	set_bit(IPOIB_STOP_NEIGH_GC, &priv->flags);

	cancel_delayed_work(&priv->neigh_reap_task);

	flush_workqueue(priv->wq);



event_failed:

	ipoib_dev_cleanup(priv->dev);



device_init_failed: