From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Sat, 8 Aug 2015 20:35:03 +0000 (-0400)
Subject: drivers/char: make SGI snsc.c driver explicitly non-modular
X-Git-Tag: v4.4-rc1~123^2~146
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2544007b0534ff21781c599115922b9a9db289b5;p=thirdparty%2Fkernel%2Flinux.git

drivers/char: make SGI snsc.c driver explicitly non-modular

The Kconfig for this driver is currently:

config SGI_SNSC
    bool "SGI Altix system controller communication support"

...meaning that it currently is not being built as a module by anyone.
Lets remove all modular references, 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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c
index 8a80ead8d3168..94006f9c2e431 100644
--- a/drivers/char/snsc.c
+++ b/drivers/char/snsc.c
@@ -19,7 +19,7 @@
 #include <linux/sched.h>
 #include <linux/device.h>
 #include <linux/poll.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <asm/sn/io.h>
@@ -461,5 +461,4 @@ scdrv_init(void)
 	}
 	return 0;
 }
-
-module_init(scdrv_init);
+device_initcall(scdrv_init);