[PATCH akpm v2] lib: test_sort: make it explicitly non-modular

* [PATCH akpm v2] lib: test_sort: make it explicitly non-modular
@ 2017-01-24 22:56 Paul Gortmaker
  2017-02-28 11:43 ` Geert Uytterhoeven
  0 siblings, 1 reply; 3+ messages in thread
From: Paul Gortmaker @ 2017-01-24 22:56 UTC (permalink / raw)
  To: linux-kernel
  Cc: Paul Gortmaker, Kostenzer Felix, Arnd Bergmann, Andrew Morton

The Kconfig currently controlling compilation of this code is:

     lib/Kconfig.debug:config TEST_SORT
     lib/Kconfig.debug:      bool "Array-based sort test"

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

Lets remove the couple traces of modular infrastructure use, so that
when reading the code there is no doubt it is builtin-only.

Since module_init translates to device_initcall in the non-modular
case, the init ordering becomes slightly earlier when we change it
to use subsys_initcall as done here.  However, since it is a self
contained test, this shouldn't be an issue and subsys_initcall
seems like a better fit for this particular case.

We also delete the MODULE_LICENSE tag since that information is now
contained at the top of the file in the comments.

Cc: Kostenzer Felix <fkostenzer@live.at>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

[v2: update for Arnd's commit that moved the code out into a
 separate file.]

 lib/test_sort.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/test_sort.c b/lib/test_sort.c
index d389c1cc2f6c..6bb2fd4a3e72 100644
--- a/lib/test_sort.c
+++ b/lib/test_sort.c
@@ -1,8 +1,11 @@
 #include <linux/sort.h>
 #include <linux/slab.h>
-#include <linux/module.h>
+#include <linux/init.h>
 
-/* a simple boot-time regression test */
+/*
+ * A simple boot-time regression test
+ * License: GPL
+ */
 
 #define TEST_LEN 1000
 
@@ -38,6 +41,4 @@ static int __init test_sort_init(void)
 	kfree(a);
 	return err;
 }
-
-module_init(test_sort_init);
-MODULE_LICENSE("GPL");
+subsys_initcall(test_sort_init);
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread