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

Groups > linux.kernel > #1335319

[tip:x86/platform] x86/platform: Make platform/intel-quark/ imr.c explicitly non-modular

Show key headers only | View raw

Commit-ID:  7f5301b7e66a1fd096b5d10dbb0bb2a8832516b4
Gitweb:     http://git.kernel.org/tip/7f5301b7e66a1fd096b5d10dbb0bb2a8832516b4
Author:     Paul Gortmaker <paul.gortmaker@windriver.com>
AuthorDate: Sun, 14 Feb 2016 18:09:52 -0500
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 16 Feb 2016 09:11:08 +0100

x86/platform: Make platform/intel-quark/imr.c explicitly non-modular

The Kconfig currently controlling compilation of this code is:

  drivers/platform/x86/Kconfig:config INTEL_IMR
  drivers/platform/x86/Kconfig:   bool "Intel Isolated Memory Region support"

...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.

Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code.

We also delete the MODULE_LICENSE tag etc. since all that information
was (or is now) contained at the top of the file in the comments.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Reviewed-by: Bryan O'Donoghue <pure.logic@nexus-software.ie>
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-2-git-send-email-paul.gortmaker@windriver.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/platform/intel-quark/imr.c | 35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

diff --git a/arch/x86/platform/intel-quark/imr.c b/arch/x86/platform/intel-quark/imr.c
index c61b6c3..0a3736f 100644
--- a/arch/x86/platform/intel-quark/imr.c
+++ b/arch/x86/platform/intel-quark/imr.c
@@ -1,5 +1,5 @@
 /**
- * imr.c
+ * imr.c -- Intel Isolated Memory Region driver
  *
  * Copyright(c) 2013 Intel Corporation.
  * Copyright(c) 2015 Bryan O'Donoghue <pure.logic@nexus-software.ie>
@@ -31,7 +31,6 @@
 #include <linux/debugfs.h>
 #include <linux/init.h>
 #include <linux/mm.h>
-#include <linux/module.h>
 #include <linux/types.h>
 
 struct imr_device {
@@ -270,17 +269,6 @@ static int imr_debugfs_register(struct imr_device *idev)
 }
 
 /**
- * imr_debugfs_unregister - unregister debugfs hooks.
- *
- * @idev:	pointer to imr_device structure.
- * @return:
- */
-static void imr_debugfs_unregister(struct imr_device *idev)
-{
-	debugfs_remove(idev->file);
-}
-
-/**
  * imr_check_params - check passed address range IMR alignment and non-zero size
  *
  * @base:	base address of intended IMR.
@@ -614,7 +602,6 @@ static const struct x86_cpu_id imr_ids[] __initconst = {
 	{ X86_VENDOR_INTEL, 5, 9 },	/* Intel Quark SoC X1000. */
 	{}
 };
-MODULE_DEVICE_TABLE(x86cpu, imr_ids);
 
 /**
  * imr_init - entry point for IMR driver.
@@ -640,22 +627,4 @@ static int __init imr_init(void)
 	imr_fixup_memmap(idev);
 	return 0;
 }
-
-/**
- * imr_exit - exit point for IMR code.
- *
- * Deregisters debugfs, leave IMR state as-is.
- *
- * return:
- */
-static void __exit imr_exit(void)
-{
-	imr_debugfs_unregister(&imr_dev);
-}
-
-module_init(imr_init);
-module_exit(imr_exit);
-
-MODULE_AUTHOR("Bryan O'Donoghue <pure.logic@nexus-software.ie>");
-MODULE_DESCRIPTION("Intel Isolated Memory Region driver");
-MODULE_LICENSE("Dual BSD/GPL");
+device_initcall(imr_init);

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