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

From: Paul Gortmaker
Date: Tue Jan 24 2017 - 17:57:01 EST


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@xxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
---

[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