All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: linux-kernel@vger.kernel.org,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>,
	Martin Schwidefsky <schwidefsky@de.ibm.com>,
	Heiko Carstens <heiko.carstens@de.ibm.com>,
	Michael Holzheu <holzheu@linux.vnet.ibm.com>,
	linux-s390@vger.kernel.org
Subject: [PATCH 3/3] s390: char: make slp_ctl explicitly non-modular
Date: Sat, 29 Oct 2016 16:38:43 -0400	[thread overview]
Message-ID: <20161029203843.515-4-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <20161029203843.515-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 usage, so that when reading
the driver there is no doubt it is builtin-only.

Since module_misc_device 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: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Cc: linux-s390@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/s390/char/sclp_ctl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/s390/char/sclp_ctl.c b/drivers/s390/char/sclp_ctl.c
index 554eaa1e347d..78a7e4f94721 100644
--- a/drivers/s390/char/sclp_ctl.c
+++ b/drivers/s390/char/sclp_ctl.c
@@ -10,7 +10,7 @@
 #include <linux/uaccess.h>
 #include <linux/miscdevice.h>
 #include <linux/gfp.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/ioctl.h>
 #include <linux/fs.h>
 #include <asm/compat.h>
@@ -126,4 +126,4 @@ static struct miscdevice sclp_ctl_device = {
 	.name = "sclp",
 	.fops = &sclp_ctl_fops,
 };
-module_misc_device(sclp_ctl_device);
+builtin_misc_device(sclp_ctl_device);
-- 
2.10.1

WARNING: multiple messages have this Message-ID (diff)
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: <linux-kernel@vger.kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>,
	Martin Schwidefsky <schwidefsky@de.ibm.com>,
	Heiko Carstens <heiko.carstens@de.ibm.com>,
	Michael Holzheu <holzheu@linux.vnet.ibm.com>,
	<linux-s390@vger.kernel.org>
Subject: [PATCH 3/3] s390: char: make slp_ctl explicitly non-modular
Date: Sat, 29 Oct 2016 16:38:43 -0400	[thread overview]
Message-ID: <20161029203843.515-4-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <20161029203843.515-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 usage, so that when reading
the driver there is no doubt it is builtin-only.

Since module_misc_device 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: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Cc: linux-s390@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/s390/char/sclp_ctl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/s390/char/sclp_ctl.c b/drivers/s390/char/sclp_ctl.c
index 554eaa1e347d..78a7e4f94721 100644
--- a/drivers/s390/char/sclp_ctl.c
+++ b/drivers/s390/char/sclp_ctl.c
@@ -10,7 +10,7 @@
 #include <linux/uaccess.h>
 #include <linux/miscdevice.h>
 #include <linux/gfp.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/ioctl.h>
 #include <linux/fs.h>
 #include <asm/compat.h>
@@ -126,4 +126,4 @@ static struct miscdevice sclp_ctl_device = {
 	.name = "sclp",
 	.fops = &sclp_ctl_fops,
 };
-module_misc_device(sclp_ctl_device);
+builtin_misc_device(sclp_ctl_device);
-- 
2.10.1

  parent reply	other threads:[~2016-10-29 20:38 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-29 20:38 [PATCH 0/3] Add new builtin_misc_device users Paul Gortmaker
2016-10-29 20:38 ` Paul Gortmaker
2016-10-29 20:38 ` [PATCH 1/3] lightnvm: make core.c explicitly non-modular Paul Gortmaker
2016-10-29 22:01   ` kbuild test robot
2016-10-29 22:36     ` Paul Gortmaker
2016-10-29 20:38 ` [PATCH 2/3] blackfin: make-bf561/coreb.c " Paul Gortmaker
2016-10-30  1:02   ` kbuild test robot
2016-10-29 20:38 ` Paul Gortmaker [this message]
2016-10-29 20:38   ` [PATCH 3/3] s390: char: make slp_ctl " Paul Gortmaker
2016-10-29 22:49   ` kbuild test robot
2016-10-29 22:49     ` kbuild test robot
2016-10-30 13:43   ` Martin Schwidefsky
2016-10-30 13:43     ` Martin Schwidefsky
2016-10-30 16:04     ` Paul Gortmaker
2016-10-30 16:04       ` Paul Gortmaker

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=20161029203843.515-4-paul.gortmaker@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=heiko.carstens@de.ibm.com \
    --cc=holzheu@linux.vnet.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.