From c2e49c92326f9baaa490492c48bea5a7f49d3244 Mon Sep 17 00:00:00 2001 From: Mark Bloch Date: Thu, 19 May 2016 17:12:33 +0300 Subject: 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 Signed-off-by: Doug Ledford --- drivers/infiniband/core/device.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'drivers/infiniband/core/device.c') 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(); -- cgit v1.2.3-59-g8ed1b