aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2016-02-14 18:09:55 -0500
committerIngo Molnar <mingo@kernel.org>2016-02-16 03:11:09 -0500
commit52d856e88171e1ec000d0479363c1e4e81991130 (patch)
tree871cc11da96df52ef3a301c5d7587b535872d5d2
parenteb61aee743ec647f22071479a5137241a7dcab17 (diff)
x86/platform: Make platform/geode/alix.c explicitly non-modular
The Kconfig currently controlling compilation of this code is: arch/x86/Kconfig:config ALIX arch/x86/Kconfig: bool "PCEngines ALIX System Support (LED setup)" ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, 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 moduleparam.h since the file does declare some module parameters, and leaving them as such is currently the easiest way to remain compatible with existing boot arg use cases. We also delete the MODULE_LICENSE tag etc. since all that information is already contained at the top of the file in the comments. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: Ed Wildgoose <kernel@wildgooses.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1455491396-30977-5-git-send-email-paul.gortmaker@windriver.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/platform/geode/alix.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/platform/geode/alix.c b/arch/x86/platform/geode/alix.c
index 76b6632d3143..1865c196f136 100644
--- a/arch/x86/platform/geode/alix.c
+++ b/arch/x86/platform/geode/alix.c
@@ -21,7 +21,7 @@
21#include <linux/init.h> 21#include <linux/init.h>
22#include <linux/io.h> 22#include <linux/io.h>
23#include <linux/string.h> 23#include <linux/string.h>
24#include <linux/module.h> 24#include <linux/moduleparam.h>
25#include <linux/leds.h> 25#include <linux/leds.h>
26#include <linux/platform_device.h> 26#include <linux/platform_device.h>
27#include <linux/gpio.h> 27#include <linux/gpio.h>
@@ -35,6 +35,11 @@
35#define BIOS_SIGNATURE_COREBOOT 0x500 35#define BIOS_SIGNATURE_COREBOOT 0x500
36#define BIOS_REGION_SIZE 0x10000 36#define BIOS_REGION_SIZE 0x10000
37 37
38/*
39 * This driver is not modular, but to keep back compatibility
40 * with existing use cases, continuing with module_param is
41 * the easiest way forward.
42 */
38static bool force = 0; 43static bool force = 0;
39module_param(force, bool, 0444); 44module_param(force, bool, 0444);
40/* FIXME: Award bios is not automatically detected as Alix platform */ 45/* FIXME: Award bios is not automatically detected as Alix platform */
@@ -192,9 +197,4 @@ static int __init alix_init(void)
192 197
193 return 0; 198 return 0;
194} 199}
195 200device_initcall(alix_init);
196module_init(alix_init);
197
198MODULE_AUTHOR("Ed Wildgoose <kernel@wildgooses.com>");
199MODULE_DESCRIPTION("PCEngines ALIX System Setup");
200MODULE_LICENSE("GPL");