mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: <linux-kernel@vger.kernel.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
	Ed Wildgoose <kernel@wildgooses.com>, <x86@kernel.org>
Subject: [PATCH 4/5] x86: make platform/geode/alix.c explicitly non-modular
Date: Sun, 14 Feb 2016 18:09:55 -0500	[thread overview]
Message-ID: <1455491396-30977-5-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1455491396-30977-1-git-send-email-paul.gortmaker@windriver.com>

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

  parent reply	other threads:[~2016-02-14 23:10 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-14 23:09 [PATCH 0/5] x86: remove modular references from non modular code Paul Gortmaker
2016-02-14 23:09 ` [PATCH 1/5] x86: make platform/intel-quark/imr.c explicitly non-modular Paul Gortmaker
2016-02-15  9:27   ` Bryan O'Donoghue
2016-02-16 12:12   ` [tip:x86/platform] x86/platform: Make platform/intel-quark/ imr.c " tip-bot for Paul Gortmaker
2016-02-14 23:09 ` [PATCH] x86: make platform/intel-quark/imr_selftest.c " Paul Gortmaker
2016-02-15  9:27   ` Bryan O'Donoghue
2016-02-16 12:13   ` [tip:x86/platform] x86/platform: Make platform/intel-quark/ imr_selftest.c " tip-bot for Paul Gortmaker
2016-02-14 23:09 ` [PATCH 3/5] x86: make platform/geode/geos.c " Paul Gortmaker
2016-02-16 12:13   ` [tip:x86/platform] x86/platform: Make platform/geode/ geos.c " tip-bot for Paul Gortmaker
2016-02-14 23:09 ` Paul Gortmaker [this message]
2016-02-16 12:13   ` [tip:x86/platform] x86/platform: Make platform/geode/ alix.c " tip-bot for Paul Gortmaker
2016-02-14 23:09 ` [PATCH 5/5] x86: make platform/geode/net5501.c " Paul Gortmaker
2016-02-16 12:14   ` [tip:x86/platform] x86/platform: Make platform/geode/ net5501.c " tip-bot for Paul Gortmaker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1455491396-30977-5-git-send-email-paul.gortmaker@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=hpa@zytor.com \
    --cc=kernel@wildgooses.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome