Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1333765

[PATCH 4/5] x86: make platform/geode/alix.c explicitly non-modular

Show all headers | View raw

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.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ed Wildgoose <kernel@wildgooses.com>
Cc: x86@kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 arch/x86/platform/geode/alix.c | 14 +++++++-------
 1 file 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 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/string.h>
-#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/leds.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
@@ -35,6 +35,11 @@
 #define BIOS_SIGNATURE_COREBOOT		0x500
 #define BIOS_REGION_SIZE		0x10000
 
+/*
+ * This driver is not modular, but to keep back compatibility
+ * with existing use cases, continuing with module_param is
+ * the easiest way forward.
+ */
 static bool force = 0;
 module_param(force, bool, 0444);
 /* FIXME: Award bios is not automatically detected as Alix platform */
@@ -192,9 +197,4 @@ static int __init alix_init(void)
 
 	return 0;
 }
-
-module_init(alix_init);
-
-MODULE_AUTHOR("Ed Wildgoose <kernel@wildgooses.com>");
-MODULE_DESCRIPTION("PCEngines ALIX System Setup");
-MODULE_LICENSE("GPL");
+device_initcall(alix_init);
-- 
2.6.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/5] x86: remove modular references from non modular code Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-02-15 00:20 +0100
  [PATCH 4/5] x86: make platform/geode/alix.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-02-15 00:20 +0100
    [tip:x86/platform] x86/platform: Make platform/geode/  alix.c explicitly non-modular tip-bot for Paul Gortmaker <tipbot@zytor.com> - 2016-02-16 13:20 +0100
  [PATCH 3/5] x86: make platform/geode/geos.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-02-15 00:20 +0100
    [tip:x86/platform] x86/platform: Make platform/geode/  geos.c explicitly non-modular tip-bot for Paul Gortmaker <tipbot@zytor.com> - 2016-02-16 13:20 +0100
  [PATCH 1/5] x86: make platform/intel-quark/imr.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-02-15 00:20 +0100
    Re: [PATCH 1/5] x86: make platform/intel-quark/imr.c explicitly  non-modular Bryan O'Donoghue <pure.logic@nexus-software.ie> - 2016-02-15 10:30 +0100
    [tip:x86/platform] x86/platform: Make platform/intel-quark/  imr.c explicitly non-modular tip-bot for Paul Gortmaker <tipbot@zytor.com> - 2016-02-16 13:20 +0100
  [PATCH 5/5] x86: make platform/geode/net5501.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-02-15 00:20 +0100
    [tip:x86/platform] x86/platform: Make platform/geode/  net5501.c explicitly non-modular tip-bot for Paul Gortmaker <tipbot@zytor.com> - 2016-02-16 13:20 +0100

csiph-web