Commit c78874f1 authored Oct 31, 2016 by Paul Gortmaker Committed by Jesper Nilsson Nov 07, 2016

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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: Jesper Nilsson <jespern@axis.com>

parent 328cf692

drivers/tty/serial/crisv10.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -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);