RDMA/rtrs: Clean up rtrs_rdma_dev_pd_ops

Let's remove them since the three members are not used.

Acked-by: Md Haris Iqbal <haris.iqbal@ionos.com>
Signed-off-by: Guoqing Jiang <guoqing.jiang@linux.dev>
Link: https://lore.kernel.org/r/20221117101945.6317-7-guoqing.jiang@linux.dev
Signed-off-by: Leon Romanovsky <leon@kernel.org>

diff --git a/drivers/infiniband/ulp/rtrs/rtrs-pri.h b/drivers/infiniband/ulp/rtrs/rtrs-pri.h
index a2420eecaf5a1080c8e9f5f49ba9b70123a5b806..ab25619261d28b98d90488822fae4971bf0a1a55 100644 (file)
--- a/drivers/infiniband/ulp/rtrs/rtrs-pri.h
+++ b/drivers/infiniband/ulp/rtrs/rtrs-pri.h
@@ -68,10 +68,7 @@ enum {
 struct rtrs_ib_dev;
 
 struct rtrs_rdma_dev_pd_ops {
-       struct rtrs_ib_dev *(*alloc)(void);
-       void (*free)(struct rtrs_ib_dev *dev);
        int (*init)(struct rtrs_ib_dev *dev);
-       void (*deinit)(struct rtrs_ib_dev *dev);
 };
 
 struct rtrs_rdma_dev_pd {

diff --git a/drivers/infiniband/ulp/rtrs/rtrs.c b/drivers/infiniband/ulp/rtrs/rtrs.c
index ed324b47d93ae48017c34a80ab70d0b609adfbc7..4bf9d868cc522bd8b7631f0f28aba9199385800c 100644 (file)
--- a/drivers/infiniband/ulp/rtrs/rtrs.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs.c
@@ -557,7 +557,6 @@ EXPORT_SYMBOL(rtrs_addr_to_sockaddr);
 void rtrs_rdma_dev_pd_init(enum ib_pd_flags pd_flags,
                            struct rtrs_rdma_dev_pd *pool)
 {
-       WARN_ON(pool->ops && (!pool->ops->alloc ^ !pool->ops->free));
        INIT_LIST_HEAD(&pool->list);
        mutex_init(&pool->mutex);
        pool->pd_flags = pd_flags;
@@ -583,15 +582,8 @@ static void dev_free(struct kref *ref)
        list_del(&dev->entry);
        mutex_unlock(&pool->mutex);
 
-       if (pool->ops && pool->ops->deinit)
-               pool->ops->deinit(dev);
-
        ib_dealloc_pd(dev->ib_pd);
-
-       if (pool->ops && pool->ops->free)
-               pool->ops->free(dev);
-       else
-               kfree(dev);
+       kfree(dev);
 }
 
 int rtrs_ib_dev_put(struct rtrs_ib_dev *dev)
@@ -618,11 +610,8 @@ rtrs_ib_dev_find_or_add(struct ib_device *ib_dev,
                        goto out_unlock;
        }
        mutex_unlock(&pool->mutex);
-       if (pool->ops && pool->ops->alloc)
-               dev = pool->ops->alloc();
-       else
-               dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-       if (IS_ERR_OR_NULL(dev))
+       dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+       if (!dev)
                goto out_err;
 
        kref_init(&dev->ref);
@@ -644,10 +633,7 @@ out_unlock:
 out_free_pd:
        ib_dealloc_pd(dev->ib_pd);
 out_free_dev:
-       if (pool->ops && pool->ops->free)
-               pool->ops->free(dev);
-       else
-               kfree(dev);
+       kfree(dev);
 out_err:
        return NULL;
 }