diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-04-20 23:29:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-22 21:50:54 -0700 |
| commit | 15253b4a719c0fc6ea8e5f5f3460d841f73ec1c9 (patch) | |
| tree | df4adbe50dceadbd071f6edd7a34b870a832d333 /net/strparser | |
| parent | 3557b3fdeefacdd111469f90db1a0602902c9698 (diff) | |
| download | linux-stable-15253b4a719c0fc6ea8e5f5f3460d841f73ec1c9.tar.gz linux-stable-15253b4a719c0fc6ea8e5f5f3460d841f73ec1c9.tar.bz2 linux-stable-15253b4a719c0fc6ea8e5f5f3460d841f73ec1c9.zip | |
net: strparser: make it explicitly non-modular
The Kconfig currently controlling compilation of this code is:
net/strparser/Kconfig:config STREAM_PARSER
net/strparser/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. For
clarity, we change the fcn name mod_init to dev_init at the same time.
We replace module.h with init.h and export.h ; the latter since this
file exports some syms.
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Martin KaFai Lau <kafai@fb.com>
Cc: Song Liu <songliubraving@fb.com>
Cc: Yonghong Song <yhs@fb.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/strparser')
| -rw-r--r-- | net/strparser/strparser.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c index 0ba363624339..e137698e8aef 100644 --- a/net/strparser/strparser.c +++ b/net/strparser/strparser.c @@ -14,7 +14,8 @@ #include <linux/file.h> #include <linux/in.h> #include <linux/kernel.h> -#include <linux/module.h> +#include <linux/export.h> +#include <linux/init.h> #include <linux/net.h> #include <linux/netdevice.h> #include <linux/poll.h> @@ -545,7 +546,7 @@ void strp_check_rcv(struct strparser *strp) } EXPORT_SYMBOL_GPL(strp_check_rcv); -static int __init strp_mod_init(void) +static int __init strp_dev_init(void) { strp_wq = create_singlethread_workqueue("kstrp"); if (unlikely(!strp_wq)) @@ -553,11 +554,4 @@ static int __init strp_mod_init(void) return 0; } - -static void __exit strp_mod_exit(void) -{ - destroy_workqueue(strp_wq); -} -module_init(strp_mod_init); -module_exit(strp_mod_exit); -MODULE_LICENSE("GPL"); +device_initcall(strp_dev_init); |