RDMA/core: Remove indirection through ib_cache_setup()

This once might have made sense when cache.c was in a different module
from device.c, but  today it just obfuscation. Get rid of the wrappers
and call roge_gid_mgmt_init()/cleanup() directly.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>

diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c
index 0d11538c2a258b9817ef1fa7c84ba158b5bf8090..2bdfc4b4a15ce82a1d467d11a3ec395a2fae8f01 100644 (file)
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -1295,13 +1295,3 @@ void ib_cache_cleanup_one(struct ib_device *device)
        flush_workqueue(ib_wq);
        gid_table_cleanup_one(device);
 }
-
-void __init ib_cache_setup(void)
-{
-       roce_gid_mgmt_init();
-}
-
-void __exit ib_cache_cleanup(void)
-{
-       roce_gid_mgmt_cleanup();
-}

diff --git a/drivers/infiniband/core/core_priv.h b/drivers/infiniband/core/core_priv.h
index 54163a6e4067f3c2ae97657a31f39c945e0e319a..fae417a391fb25f7001b0096e87fbe88f3336829 100644 (file)
--- a/drivers/infiniband/core/core_priv.h
+++ b/drivers/infiniband/core/core_priv.h
@@ -88,9 +88,6 @@ int  ib_device_register_sysfs(struct ib_device *device,
                                                   u8, struct kobject *));
 void ib_device_unregister_sysfs(struct ib_device *device);
 
-void ib_cache_setup(void);
-void ib_cache_cleanup(void);
-
 typedef void (*roce_netdev_callback)(struct ib_device *device, u8 port,
              struct net_device *idev, void *cookie);
 

diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index ea9fbcfb21bd4ac683b9411061dde5c23b640256..84f51386e1e30be7558adeb7e93b4eb1deceba9e 100644 (file)
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -1225,7 +1225,7 @@ static int __init ib_core_init(void)
 
        nldev_init();
        rdma_nl_register(RDMA_NL_LS, ibnl_ls_cb_table);
-       ib_cache_setup();
+       roce_gid_mgmt_init();
 
        return 0;
 
@@ -1248,7 +1248,7 @@ err:
 
 static void __exit ib_core_cleanup(void)
 {
-       ib_cache_cleanup();
+       roce_gid_mgmt_cleanup();
        nldev_exit();
        rdma_nl_unregister(RDMA_NL_LS);
        unregister_lsm_notifier(&ibdev_lsm_nb);