Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1512195

[PATCH 3/9] s390: char: make con3215 explicitly non-modular

Show all headers | View raw

The Kconfig currently controlling compilation of this code is:

drivers/s390/char/Kconfig:config TN3215
drivers/s390/char/Kconfig:      def_bool y

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

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

Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux-s390@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/s390/char/con3215.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 931d10e86837..1b8d825623bd 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -9,7 +9,6 @@
  *	      Dan Morrison, IBM Corporation <dmorriso@cse.buffalo.edu>
  */
 
-#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kdev_t.h>
 #include <linux/tty.h>
@@ -1215,13 +1214,4 @@ static int __init tty3215_init(void)
 	tty3215_driver = driver;
 	return 0;
 }
-
-static void __exit tty3215_exit(void)
-{
-	tty_unregister_driver(tty3215_driver);
-	put_tty_driver(tty3215_driver);
-	ccw_driver_unregister(&raw3215_ccw_driver);
-}
-
-module_init(tty3215_init);
-module_exit(tty3215_exit);
+device_initcall(tty3215_init);
-- 
2.10.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/9] s390: remove modular usage from non-modular code Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-10-30 21:40 +0100
  [PATCH 7/9] s390: hypfs: make inode explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-10-30 21:50 +0100
  [PATCH 6/9] s390: hotplug: make pci_hpc explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-10-30 21:50 +0100
  [PATCH 3/9] s390: char: make con3215 explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-10-30 21:50 +0100
  [PATCH 5/9] s390: char: make slcp_quiesce explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-10-30 21:50 +0100
  [PATCH 2/9] s390: char: make zcore explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-10-30 21:50 +0100
  Re: [PATCH 0/9] s390: remove modular usage from non-modular code Heiko Carstens <heiko.carstens@de.ibm.com> - 2016-10-31 10:30 +0100

csiph-web