diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-10-31 13:42:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-10 08:34:27 -0500 |
commit | 146b4d5b36b51ce4a86a538e315c89558949b69a (patch) | |
tree | ff4e5ff8acd29b9a8160dabc501f739eb7cab777 /drivers/tty | |
parent | 9211432b4ac59b090ae67380b034d8e33077e23c (diff) |
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 <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: linux-cris-kernel@axis.com
Cc: linux-serial@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/crisv10.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c index 315c84979b18..6450a38cb1aa 100644 --- a/drivers/tty/serial/crisv10.c +++ b/drivers/tty/serial/crisv10.c | |||
@@ -28,7 +28,6 @@ static char *serial_version = "$Revision: 1.25 $"; | |||
28 | #include <linux/bitops.h> | 28 | #include <linux/bitops.h> |
29 | #include <linux/seq_file.h> | 29 | #include <linux/seq_file.h> |
30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
31 | #include <linux/module.h> | ||
32 | #include <linux/uaccess.h> | 31 | #include <linux/uaccess.h> |
33 | #include <linux/io.h> | 32 | #include <linux/io.h> |
34 | 33 | ||
@@ -4098,7 +4097,7 @@ static void show_serial_version(void) | |||
4098 | &serial_version[11]); /* "$Revision: x.yy" */ | 4097 | &serial_version[11]); /* "$Revision: x.yy" */ |
4099 | } | 4098 | } |
4100 | 4099 | ||
4101 | /* rs_init inits the driver at boot (using the module_init chain) */ | 4100 | /* rs_init inits the driver at boot (using the initcall chain) */ |
4102 | 4101 | ||
4103 | static const struct tty_operations rs_ops = { | 4102 | static const struct tty_operations rs_ops = { |
4104 | .open = rs_open, | 4103 | .open = rs_open, |
@@ -4247,5 +4246,4 @@ static int __init rs_init(void) | |||
4247 | } | 4246 | } |
4248 | 4247 | ||
4249 | /* this makes sure that rs_init is called during kernel boot */ | 4248 | /* this makes sure that rs_init is called during kernel boot */ |
4250 | 4249 | device_initcall(rs_init); | |
4251 | module_init(rs_init); | ||