diff options
| author | Mark Bloch <markb@mellanox.com> | 2016-05-19 17:12:32 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-05-24 21:40:13 +0300 |
| commit | 4c2cb4220431cbf92233dc12733ee8962abb9081 (patch) | |
| tree | 58f07d7b6a1f4013e1d992659f98d2ee12b73003 /drivers/infiniband/core/device.c | |
| parent | e3f20f02864f6da1509c523bfa1e928619e59095 (diff) | |
| download | linux-4c2cb4220431cbf92233dc12733ee8962abb9081.tar.xz | |
IB/MAD: Integrate ib_mad module into ib_core module
Consolidate ib_mad into ib_core, this commit eliminates
ib_mad.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 805d72d67db1..f80549fbd6f5 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c @@ -989,10 +989,18 @@ static int __init ib_core_init(void) goto err_ibnl; } + ret = ib_mad_init(); + if (ret) { + pr_warn("Couldn't init IB MAD\n"); + goto err_addr; + } + ib_cache_setup(); return 0; +err_addr: + addr_cleanup(); err_ibnl: ibnl_cleanup(); err_sysfs: @@ -1007,6 +1015,7 @@ err: static void __exit ib_core_cleanup(void) { ib_cache_cleanup(); + ib_mad_cleanup(); addr_cleanup(); ibnl_cleanup(); class_unregister(&ib_class); |