Skip to contentSkip to conversation

tty: serial: make crisv10 explicitly non-modular

PATCH In review Paul Gortmaker 2 participants 2 messages Oct 31, 2016 – Nov 7, 2016 TTY layer and serial drivers

lore
Share & tools
lore

Paul Gortmaker

author
#0 lore raw

PATCH 1/1 tty: serial: make crisv10 explicitly non-modular

The Kconfig currently controlling compilation of this code is:

arch/cris/arch-v10/drivers/Kconfig:config ETRAX_SERIAL
arch/cris/arch-v10/drivers/Kconfig: bool "Serial-port support"

...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 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.

We don't replace module.h with init.h since the file already has that.

Cc Mikael Starvik <[email protected]>
Cc Jesper Nilsson <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Jiri Slaby <[email protected]>
Cc [email protected]
Cc [email protected]
Signed-off-by Paul Gortmaker <[email protected]>
---
 drivers/tty/serial/crisv10.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/tty/serial/crisv10.c +2 -4
index 315c84979b18..6450a38cb1aa 100644
@@ -28,7 +28,6 @@ static char *serial_version = "$Revision: 1.25 $";
 #include <linux/bitops.h>
 #include <linux/seq_file.h>
 #include <linux/delay.h>
-#include <linux/module.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>
 

@@ -4098,7 +4097,7 @@ static void show_serial_version(void)
 	       &serial_version[11]); /* "$Revision: x.yy" */
 }
 
-/* rs_init inits the driver at boot (using the module_init chain) */
+/* rs_init inits the driver at boot (using the initcall chain) */
 
 static const struct tty_operations rs_ops = {
 	.open = rs_open,

@@ -4247,5 +4246,4 @@ static int __init rs_init(void)
 }
 
 /* this makes sure that rs_init is called during kernel boot */
-
-module_init(rs_init);
+device_initcall(rs_init);
Signature · 1 line
2.8.4
#1 lore raw
Quoted 5 lines · Paul Gortmaker

The Kconfig currently controlling compilation of this code is:

arch/cris/arch-v10/drivers/Kconfig:config ETRAX_SERIAL
arch/cris/arch-v10/drivers/Kconfig: bool "Serial-port support"

Quoted 7 lines

...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 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.

Agreed, put in the cris tree for 4.10.

Quoted 9 lines

We don't replace module.h with init.h since the file already has that.

Cc Mikael Starvik <[email protected]>
Cc Jesper Nilsson <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Jiri Slaby <[email protected]>
Cc [email protected]
Cc [email protected]
Signed-off-by Paul Gortmaker <[email protected]>

Thanks!

/^JN - Jesper Nilsson

Signature · 1 line
               Jesper Nilsson -- [email protected]