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

Commit 652432f3 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA/device: Get rid of reg_state 



This really has no purpose anymore, refcount can be used to tell if the
device is still registered. Keeping it around just invites mis-use.

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Reviewed-by: default avatarParav Pandit <parav@mellanox.com>
parent d45f89d5

drivers/infiniband/core/device.c

+2 −6
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static void ib_device_release(struct device *device) 
{

	struct ib_device *dev = container_of(device, struct ib_device, dev);



	WARN_ON(dev->reg_state == IB_DEV_REGISTERED);

	WARN_ON(refcount_read(&dev->refcount));

	ib_cache_release_one(dev);

	ib_security_release_port_pkey_list(dev);

	kfree(dev->port_pkey_list);
@@ -316,8 +316,7 @@ EXPORT_SYMBOL(_ib_alloc_device); 
void ib_dealloc_device(struct ib_device *device)

{

	WARN_ON(!list_empty(&device->client_data_list));

	WARN_ON(device->reg_state != IB_DEV_UNREGISTERED &&

		device->reg_state != IB_DEV_UNINITIALIZED);

	WARN_ON(refcount_read(&device->refcount));

	rdma_restrack_clean(device);

	put_device(&device->dev);

}
@@ -602,7 +601,6 @@ int ib_register_device(struct ib_device *device, const char *name) 
	}



	refcount_set(&device->refcount, 1);

	device->reg_state = IB_DEV_REGISTERED;



	list_for_each_entry(client, &client_list, list)

		if (!add_client_context(device, client) && client->add)
@@ -673,8 +671,6 @@ void ib_unregister_device(struct ib_device *device) 
	}

	write_unlock_irqrestore(&device->client_data_lock, flags);

	up_write(&lists_rwsem);



	device->reg_state = IB_DEV_UNREGISTERED;

}

EXPORT_SYMBOL(ib_unregister_device);

include/rdma/ib_verbs.h

+0 −6
Original line number Diff line number Diff line
@@ -2572,12 +2572,6 @@ struct ib_device { 
	struct kobject			*ports_kobj;

	struct list_head             port_list;



	enum {

		IB_DEV_UNINITIALIZED,

		IB_DEV_REGISTERED,

		IB_DEV_UNREGISTERED

	}                            reg_state;



	int			     uverbs_abi_ver;

	u64			     uverbs_cmd_mask;

	u64			     uverbs_ex_cmd_mask;