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

Groups > linux.kernel > #1512202

[PATCH 5/9] s390: char: make slcp_quiesce explicitly non-modular

Show all headers | View raw

The Makefile currently controlling compilation of this code is obj-y,
meaning that it currently is not being built as a module by anyone.

Lets remove the couple traces of modular infrastructure, 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.

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/sclp_quiesce.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/s390/char/sclp_quiesce.c b/drivers/s390/char/sclp_quiesce.c
index 475e470d9768..e4958511168a 100644
--- a/drivers/s390/char/sclp_quiesce.c
+++ b/drivers/s390/char/sclp_quiesce.c
@@ -6,7 +6,6 @@
  *             Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
  */
 
-#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/cpumask.h>
 #include <linux/smp.h>
@@ -80,5 +79,4 @@ static int __init sclp_quiesce_init(void)
 {
 	return sclp_register(&sclp_quiesce_event);
 }
-
-module_init(sclp_quiesce_init);
+device_initcall(sclp_quiesce_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