Commit 7526198f authored by Guoqing Jiang's avatar Guoqing Jiang Committed by Leon Romanovsky

RDMA/rtrs: Clean up rtrs_rdma_dev_pd_ops

Let's remove them since the three members are not used.
Acked-by: default avatarMd Haris Iqbal <haris.iqbal@ionos.com>
Signed-off-by: default avatarGuoqing Jiang <guoqing.jiang@linux.dev>
Link: https://lore.kernel.org/r/20221117101945.6317-7-guoqing.jiang@linux.devSigned-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent a4399563
...@@ -68,10 +68,7 @@ enum { ...@@ -68,10 +68,7 @@ enum {
struct rtrs_ib_dev; struct rtrs_ib_dev;
struct rtrs_rdma_dev_pd_ops { 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); int (*init)(struct rtrs_ib_dev *dev);
void (*deinit)(struct rtrs_ib_dev *dev);
}; };
struct rtrs_rdma_dev_pd { struct rtrs_rdma_dev_pd {
......
...@@ -557,7 +557,6 @@ EXPORT_SYMBOL(rtrs_addr_to_sockaddr); ...@@ -557,7 +557,6 @@ EXPORT_SYMBOL(rtrs_addr_to_sockaddr);
void rtrs_rdma_dev_pd_init(enum ib_pd_flags pd_flags, void rtrs_rdma_dev_pd_init(enum ib_pd_flags pd_flags,
struct rtrs_rdma_dev_pd *pool) struct rtrs_rdma_dev_pd *pool)
{ {
WARN_ON(pool->ops && (!pool->ops->alloc ^ !pool->ops->free));
INIT_LIST_HEAD(&pool->list); INIT_LIST_HEAD(&pool->list);
mutex_init(&pool->mutex); mutex_init(&pool->mutex);
pool->pd_flags = pd_flags; pool->pd_flags = pd_flags;
...@@ -583,15 +582,8 @@ static void dev_free(struct kref *ref) ...@@ -583,15 +582,8 @@ static void dev_free(struct kref *ref)
list_del(&dev->entry); list_del(&dev->entry);
mutex_unlock(&pool->mutex); mutex_unlock(&pool->mutex);
if (pool->ops && pool->ops->deinit)
pool->ops->deinit(dev);
ib_dealloc_pd(dev->ib_pd); ib_dealloc_pd(dev->ib_pd);
kfree(dev);
if (pool->ops && pool->ops->free)
pool->ops->free(dev);
else
kfree(dev);
} }
int rtrs_ib_dev_put(struct rtrs_ib_dev *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, ...@@ -618,11 +610,8 @@ rtrs_ib_dev_find_or_add(struct ib_device *ib_dev,
goto out_unlock; goto out_unlock;
} }
mutex_unlock(&pool->mutex); mutex_unlock(&pool->mutex);
if (pool->ops && pool->ops->alloc) dev = kzalloc(sizeof(*dev), GFP_KERNEL);
dev = pool->ops->alloc(); if (!dev)
else
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
if (IS_ERR_OR_NULL(dev))
goto out_err; goto out_err;
kref_init(&dev->ref); kref_init(&dev->ref);
...@@ -644,10 +633,7 @@ rtrs_ib_dev_find_or_add(struct ib_device *ib_dev, ...@@ -644,10 +633,7 @@ rtrs_ib_dev_find_or_add(struct ib_device *ib_dev,
out_free_pd: out_free_pd:
ib_dealloc_pd(dev->ib_pd); ib_dealloc_pd(dev->ib_pd);
out_free_dev: out_free_dev:
if (pool->ops && pool->ops->free) kfree(dev);
pool->ops->free(dev);
else
kfree(dev);
out_err: out_err:
return NULL; return NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment