Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1383655

[PATCH] lib: make sg_pool explicitly non-modular

Show all headers | View raw

The recently added Kconfig controlling compilation of this code is:

lib/Kconfig:config SG_POOL
lib/Kconfig:    def_bool n

...meaning that it currently is not being built as a module by anyone.

Lets remove the modular code that is essentially orphaned, so that
when reading the driver there is no doubt it is builtin-only.

Since module_init translates to device_initcall in the non-modular
case, the init ordering remains unchanged with this commit.  However
one might want to consider moving it to subsys_initcall if it is to
be ready ahead of SCSI drivers wanting this and using device_initcall.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Ming Lin <ming.l@ssi.samsung.com>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 lib/sg_pool.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/lib/sg_pool.c b/lib/sg_pool.c
index 6dd30615a201..e2cf548b9610 100644
--- a/lib/sg_pool.c
+++ b/lib/sg_pool.c
@@ -1,4 +1,4 @@
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/scatterlist.h>
 #include <linux/mempool.h>
 #include <linux/slab.h>
@@ -156,17 +156,4 @@ cleanup_sdb:
 
 	return -ENOMEM;
 }
-
-static __exit void sg_pool_exit(void)
-{
-	int i;
-
-	for (i = 0; i < SG_MEMPOOL_NR; i++) {
-		struct sg_pool *sgp = sg_pools + i;
-		mempool_destroy(sgp->pool);
-		kmem_cache_destroy(sgp->slab);
-	}
-}
-
-module_init(sg_pool_init);
-module_exit(sg_pool_exit);
+device_initcall(sg_pool_init);
-- 
2.8.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] lib: make sg_pool explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-04-20 21:20 +0200
  Re: [PATCH] lib: make sg_pool explicitly non-modular Ming Lin <mlin@kernel.org> - 2016-04-20 22:30 +0200
    Re: [PATCH] lib: make sg_pool explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-04-21 05:10 +0200
      Re: [PATCH] lib: make sg_pool explicitly non-modular Ming Lin <mlin@kernel.org> - 2016-04-21 06:30 +0200

csiph-web