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

Groups > linux.kernel > #1333767

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

Show all headers | View raw

The Kconfig currently controlling compilation of this code is:

arch/x86/Kconfig:config GEOS
arch/x86/Kconfig:       bool "Traverse Technologies GEOS System Support (LEDS, GPIO, etc)"

...meaning that it currently is not being built as a module by anyone.

Lets remove the couple traces of modularity, so that when reading
the code 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 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: Philip Prindeville <philipp@redfish-solutions.com>
Cc: x86@kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 arch/x86/platform/geode/geos.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/arch/x86/platform/geode/geos.c b/arch/x86/platform/geode/geos.c
index aa733fba2471..4fcdb91318a0 100644
--- a/arch/x86/platform/geode/geos.c
+++ b/arch/x86/platform/geode/geos.c
@@ -19,7 +19,6 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/string.h>
-#include <linux/module.h>
 #include <linux/leds.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
@@ -120,9 +119,4 @@ static int __init geos_init(void)
 
 	return 0;
 }
-
-module_init(geos_init);
-
-MODULE_AUTHOR("Philip Prindeville <philipp@redfish-solutions.com>");
-MODULE_DESCRIPTION("Traverse Technologies Geos System Setup");
-MODULE_LICENSE("GPL");
+device_initcall(geos_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