All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: linux-kernel@vger.kernel.org
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>,
	Martin Schwidefsky <schwidefsky@de.ibm.com>,
	Heiko Carstens <heiko.carstens@de.ibm.com>,
	linux-s390@vger.kernel.org
Subject: [PATCH 8/9] s390: kernel: make lgr explicitly non-modular
Date: Sun, 30 Oct 2016 16:37:31 -0400	[thread overview]
Message-ID: <20161030203732.26405-9-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <20161030203732.26405-1-paul.gortmaker@windriver.com>

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 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 replace module.h with init.h and export.h since the file does
export some symbols.

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>
---
 arch/s390/kernel/lgr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/s390/kernel/lgr.c b/arch/s390/kernel/lgr.c
index 6ea6d69339b5..ae7dff110054 100644
--- a/arch/s390/kernel/lgr.c
+++ b/arch/s390/kernel/lgr.c
@@ -5,7 +5,8 @@
  * Author(s): Michael Holzheu <holzheu@linux.vnet.ibm.com>
  */
 
-#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/export.h>
 #include <linux/timer.h>
 #include <linux/slab.h>
 #include <asm/facility.h>
@@ -183,4 +184,4 @@ static int __init lgr_init(void)
 	lgr_timer_set();
 	return 0;
 }
-module_init(lgr_init);
+device_initcall(lgr_init);
-- 
2.10.1

WARNING: multiple messages have this Message-ID (diff)
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: <linux-kernel@vger.kernel.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>,
	Martin Schwidefsky <schwidefsky@de.ibm.com>,
	Heiko Carstens <heiko.carstens@de.ibm.com>,
	<linux-s390@vger.kernel.org>
Subject: [PATCH 8/9] s390: kernel: make lgr explicitly non-modular
Date: Sun, 30 Oct 2016 16:37:31 -0400	[thread overview]
Message-ID: <20161030203732.26405-9-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <20161030203732.26405-1-paul.gortmaker@windriver.com>

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 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 replace module.h with init.h and export.h since the file does
export some symbols.

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>
---
 arch/s390/kernel/lgr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/s390/kernel/lgr.c b/arch/s390/kernel/lgr.c
index 6ea6d69339b5..ae7dff110054 100644
--- a/arch/s390/kernel/lgr.c
+++ b/arch/s390/kernel/lgr.c
@@ -5,7 +5,8 @@
  * Author(s): Michael Holzheu <holzheu@linux.vnet.ibm.com>
  */
 
-#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/export.h>
 #include <linux/timer.h>
 #include <linux/slab.h>
 #include <asm/facility.h>
@@ -183,4 +184,4 @@ static int __init lgr_init(void)
 	lgr_timer_set();
 	return 0;
 }
-module_init(lgr_init);
+device_initcall(lgr_init);
-- 
2.10.1

  parent reply	other threads:[~2016-10-30 20:37 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-30 20:37 [PATCH 0/9] s390: remove modular usage from non-modular code Paul Gortmaker
2016-10-30 20:37 ` Paul Gortmaker
2016-10-30 20:37 ` [PATCH 1/9] s390: cio: make it explicitly non-modular Paul Gortmaker
2016-10-30 20:37   ` Paul Gortmaker
2016-10-30 20:37 ` [PATCH 2/9] s390: char: make zcore " Paul Gortmaker
2016-10-30 20:37   ` Paul Gortmaker
2016-10-30 20:37 ` [PATCH 3/9] s390: char: make con3215 " Paul Gortmaker
2016-10-30 20:37   ` Paul Gortmaker
2016-10-30 20:37 ` [PATCH 4/9] s390: char: make sclp_tty " Paul Gortmaker
2016-10-30 20:37   ` Paul Gortmaker
2016-10-30 20:37 ` [PATCH 5/9] s390: char: make slcp_quiesce " Paul Gortmaker
2016-10-30 20:37   ` Paul Gortmaker
2016-10-30 20:37 ` [PATCH 6/9] s390: hotplug: make pci_hpc " Paul Gortmaker
2016-10-30 20:37   ` Paul Gortmaker
2016-10-30 20:37 ` [PATCH 7/9] s390: hypfs: make inode " Paul Gortmaker
2016-10-30 20:37   ` Paul Gortmaker
2016-10-30 20:37 ` Paul Gortmaker [this message]
2016-10-30 20:37   ` [PATCH 8/9] s390: kernel: make lgr " Paul Gortmaker
2016-10-30 20:37 ` [PATCH 9/9] s390: virtio: make ccw " Paul Gortmaker
2016-10-30 20:37   ` Paul Gortmaker
2016-10-31 10:56   ` Cornelia Huck
2016-10-31 10:56     ` Cornelia Huck
2016-10-31  9:24 ` [PATCH 0/9] s390: remove modular usage from non-modular code Heiko Carstens

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161030203732.26405-9-paul.gortmaker@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=heiko.carstens@de.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=schwidefsky@de.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.