diff options
| author | Mark Bloch <markb@mellanox.com> | 2016-05-19 17:12:33 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-05-24 14:42:36 -0400 |
| commit | c2e49c92326f9baaa490492c48bea5a7f49d3244 (patch) | |
| tree | 1312cb0b8d02ff2e1ac9965f298ca8886f5d4b82 /drivers/infiniband/core/device.c | |
| parent | 4c2cb4220431cbf92233dc12733ee8962abb9081 (diff) | |
| download | blackbird-op-linux-c2e49c92326f9baaa490492c48bea5a7f49d3244.tar.gz blackbird-op-linux-c2e49c92326f9baaa490492c48bea5a7f49d3244.zip | |
IB/SA: Integrate ib_sa module into ib_core module
Consolidate ib_sa into ib_core, this commit eliminates
ib_sa.ko and makes it part of ib_core.ko
Signed-off-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/core/device.c')
| -rw-r--r-- | drivers/infiniband/core/device.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c index f80549fbd6f5..2cd0956aef34 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c @@ -995,10 +995,18 @@ static int __init ib_core_init(void) goto err_addr; } + ret = ib_sa_init(); + if (ret) { + pr_warn("Couldn't init SA\n"); + goto err_mad; + } + ib_cache_setup(); return 0; +err_mad: + ib_mad_cleanup(); err_addr: addr_cleanup(); err_ibnl: @@ -1015,6 +1023,7 @@ err: static void __exit ib_core_cleanup(void) { ib_cache_cleanup(); + ib_sa_cleanup(); ib_mad_cleanup(); addr_cleanup(); ibnl_cleanup(); |
