Skip to content

Commit 7526198

Browse files
Guoqing Jiangrleon
authored andcommitted
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 <[email protected]> Signed-off-by: Guoqing Jiang <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Leon Romanovsky <[email protected]>
1 parent a439956 commit 7526198

File tree

2 files changed

+4
-21
lines changed

2 files changed

+4
-21
lines changed

drivers/infiniband/ulp/rtrs/rtrs-pri.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,7 @@ enum {
6868
struct rtrs_ib_dev;
6969

7070
struct rtrs_rdma_dev_pd_ops {
71-
struct rtrs_ib_dev *(*alloc)(void);
72-
void (*free)(struct rtrs_ib_dev *dev);
7371
int (*init)(struct rtrs_ib_dev *dev);
74-
void (*deinit)(struct rtrs_ib_dev *dev);
7572
};
7673

7774
struct rtrs_rdma_dev_pd {

drivers/infiniband/ulp/rtrs/rtrs.c

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,6 @@ EXPORT_SYMBOL(rtrs_addr_to_sockaddr);
557557
void rtrs_rdma_dev_pd_init(enum ib_pd_flags pd_flags,
558558
struct rtrs_rdma_dev_pd *pool)
559559
{
560-
WARN_ON(pool->ops && (!pool->ops->alloc ^ !pool->ops->free));
561560
INIT_LIST_HEAD(&pool->list);
562561
mutex_init(&pool->mutex);
563562
pool->pd_flags = pd_flags;
@@ -583,15 +582,8 @@ static void dev_free(struct kref *ref)
583582
list_del(&dev->entry);
584583
mutex_unlock(&pool->mutex);
585584

586-
if (pool->ops && pool->ops->deinit)
587-
pool->ops->deinit(dev);
588-
589585
ib_dealloc_pd(dev->ib_pd);
590-
591-
if (pool->ops && pool->ops->free)
592-
pool->ops->free(dev);
593-
else
594-
kfree(dev);
586+
kfree(dev);
595587
}
596588

597589
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,
618610
goto out_unlock;
619611
}
620612
mutex_unlock(&pool->mutex);
621-
if (pool->ops && pool->ops->alloc)
622-
dev = pool->ops->alloc();
623-
else
624-
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
625-
if (IS_ERR_OR_NULL(dev))
613+
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
614+
if (!dev)
626615
goto out_err;
627616

628617
kref_init(&dev->ref);
@@ -644,10 +633,7 @@ rtrs_ib_dev_find_or_add(struct ib_device *ib_dev,
644633
out_free_pd:
645634
ib_dealloc_pd(dev->ib_pd);
646635
out_free_dev:
647-
if (pool->ops && pool->ops->free)
648-
pool->ops->free(dev);
649-
else
650-
kfree(dev);
636+
kfree(dev);
651637
out_err:
652638
return NULL;
653639
}

0 commit comments

Comments
 (0)