@@ -557,7 +557,6 @@ EXPORT_SYMBOL(rtrs_addr_to_sockaddr);
557
557
void rtrs_rdma_dev_pd_init (enum ib_pd_flags pd_flags ,
558
558
struct rtrs_rdma_dev_pd * pool )
559
559
{
560
- WARN_ON (pool -> ops && (!pool -> ops -> alloc ^ !pool -> ops -> free ));
561
560
INIT_LIST_HEAD (& pool -> list );
562
561
mutex_init (& pool -> mutex );
563
562
pool -> pd_flags = pd_flags ;
@@ -583,15 +582,8 @@ static void dev_free(struct kref *ref)
583
582
list_del (& dev -> entry );
584
583
mutex_unlock (& pool -> mutex );
585
584
586
- if (pool -> ops && pool -> ops -> deinit )
587
- pool -> ops -> deinit (dev );
588
-
589
585
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 );
595
587
}
596
588
597
589
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
610
goto out_unlock ;
619
611
}
620
612
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 )
626
615
goto out_err ;
627
616
628
617
kref_init (& dev -> ref );
@@ -644,10 +633,7 @@ rtrs_ib_dev_find_or_add(struct ib_device *ib_dev,
644
633
out_free_pd :
645
634
ib_dealloc_pd (dev -> ib_pd );
646
635
out_free_dev :
647
- if (pool -> ops && pool -> ops -> free )
648
- pool -> ops -> free (dev );
649
- else
650
- kfree (dev );
636
+ kfree (dev );
651
637
out_err :
652
638
return NULL ;
653
639
}
0 commit comments