Skip to content

Commit

Permalink
RDMA/core: Remove indirection through ib_cache_setup()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jason Gunthorpe committed May 29, 2018
1 parent 0394808 commit 5ef8c0c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 15 deletions.
10 changes: 0 additions & 10 deletions drivers/infiniband/core/cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
3 changes: 0 additions & 3 deletions drivers/infiniband/core/core_priv.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions drivers/infiniband/core/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -1248,7 +1248,7 @@ static int __init ib_core_init(void)

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);
Expand Down

0 comments on commit 5ef8c0c

Please sign in to comment.