IB/uverbs: Replace ib_ucq_object uverbs_file with the one in ib_uobject

Now that ib_uobject has a ib_uverbs_file we don't need this extra one in
ib_ucq_object.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/uverbs.h b/drivers/infiniband/core/uverbs.h
index cbb727f0959f2b054a4a3c788a488bef8b0fc8ff..3ddd39e435e1290d51c0fe1285cce25a3d4cc908 100644 (file)
--- a/drivers/infiniband/core/uverbs.h
+++ b/drivers/infiniband/core/uverbs.h
@@ -204,7 +204,6 @@ struct ib_uwq_object {
 
 struct ib_ucq_object {
        struct ib_uobject       uobject;
-       struct ib_uverbs_file  *uverbs_file;
        struct list_head        comp_list;
        struct list_head        async_list;
        u32                     comp_events_reported;

diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index bb2df271d3ffc99fad936e963f934f6d4f78e046..d048cabc424690c82d271c3403b1217a902cabbf 100644 (file)
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -976,7 +976,6 @@ static struct ib_ucq_object *create_cq(struct ib_uverbs_file *file,
        }
 
        obj->uobject.user_handle = cmd->user_handle;
-       obj->uverbs_file           = file;
        obj->comp_events_reported  = 0;
        obj->async_events_reported = 0;
        INIT_LIST_HEAD(&obj->comp_list);

diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index e9a50ee0ba7621ec8a7c4486c135f9009c621cb7..8425718bebbd832357011e05e12a529a1d505929 100644 (file)
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -538,7 +538,7 @@ void ib_uverbs_cq_event_handler(struct ib_event *event, void *context_ptr)
        struct ib_ucq_object *uobj = container_of(event->element.cq->uobject,
                                                  struct ib_ucq_object, uobject);
 
-       ib_uverbs_async_handler(uobj->uverbs_file, uobj->uobject.user_handle,
+       ib_uverbs_async_handler(uobj->uobject.ufile, uobj->uobject.user_handle,
                                event->event, &uobj->async_list,
                                &uobj->async_events_reported);
 }

diff --git a/drivers/infiniband/core/uverbs_std_types_cq.c b/drivers/infiniband/core/uverbs_std_types_cq.c
index 9d39a9e1e411658bd2b14bf2dd8666fb65dc85b0..ce9c9c66bae42f7675c08729170025c57f586de2 100644 (file)
--- a/drivers/infiniband/core/uverbs_std_types_cq.c
+++ b/drivers/infiniband/core/uverbs_std_types_cq.c
@@ -105,7 +105,6 @@ static int UVERBS_HANDLER(UVERBS_METHOD_CQ_CREATE)(struct ib_device *ib_dev,
        obj = container_of(uverbs_attr_get_uobject(attrs,
                                                   UVERBS_ATTR_CREATE_CQ_HANDLE),
                           typeof(*obj), uobject);
-       obj->uverbs_file           = file;
        obj->comp_events_reported  = 0;
        obj->async_events_reported = 0;
        INIT_LIST_HEAD(&obj->comp_list);