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: Jason Gunthorpe <jgg@mellanox.com>
Reviewed-by: Parav Pandit <parav@mellanox.com>

diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 872662a84b162423169e41ea2240ce8b4cbd145a..1c54ded776d00cdbe0d5e941da4d414a6262d608 100644 (file)
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -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);
 

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 854d7816787c9e33782e0f7682bdac6b09fd7c53..d8ba987e8b290988afc5de0c5549deda3a3ea800 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -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;