Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

s390: char: make slp_ctl explicitly non-modular

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: 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>
Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Paul Gortmaker and committed by
Greg Kroah-Hartman
c1eac0d0 2d4d3b5d

+2 -2
+2 -2
drivers/s390/char/sclp_ctl.c
··· 10 10 #include <linux/uaccess.h> 11 11 #include <linux/miscdevice.h> 12 12 #include <linux/gfp.h> 13 - #include <linux/module.h> 13 + #include <linux/init.h> 14 14 #include <linux/ioctl.h> 15 15 #include <linux/fs.h> 16 16 #include <asm/compat.h> ··· 126 126 .name = "sclp", 127 127 .fops = &sclp_ctl_fops, 128 128 }; 129 - module_misc_device(sclp_ctl_device); 129 + builtin_misc_device(sclp_ctl_device);