diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-02-14 18:09:52 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-02-16 03:11:08 -0500 |
commit | 7f5301b7e66a1fd096b5d10dbb0bb2a8832516b4 (patch) | |
tree | 02d9ac98cbcf41c87a0104d2cf9de512ae547665 | |
parent | 1926e54f115725a9248d0c4c65c22acaf94de4c4 (diff) |
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>
-rw-r--r-- | arch/x86/platform/intel-quark/imr.c | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/arch/x86/platform/intel-quark/imr.c b/arch/x86/platform/intel-quark/imr.c index c61b6c332e97..0a3736f03edc 100644 --- a/arch/x86/platform/intel-quark/imr.c +++ b/arch/x86/platform/intel-quark/imr.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * imr.c | 2 | * imr.c -- Intel Isolated Memory Region driver |
3 | * | 3 | * |
4 | * Copyright(c) 2013 Intel Corporation. | 4 | * Copyright(c) 2013 Intel Corporation. |
5 | * Copyright(c) 2015 Bryan O'Donoghue <pure.logic@nexus-software.ie> | 5 | * Copyright(c) 2015 Bryan O'Donoghue <pure.logic@nexus-software.ie> |
@@ -31,7 +31,6 @@ | |||
31 | #include <linux/debugfs.h> | 31 | #include <linux/debugfs.h> |
32 | #include <linux/init.h> | 32 | #include <linux/init.h> |
33 | #include <linux/mm.h> | 33 | #include <linux/mm.h> |
34 | #include <linux/module.h> | ||
35 | #include <linux/types.h> | 34 | #include <linux/types.h> |
36 | 35 | ||
37 | struct imr_device { | 36 | struct imr_device { |
@@ -270,17 +269,6 @@ static int imr_debugfs_register(struct imr_device *idev) | |||
270 | } | 269 | } |
271 | 270 | ||
272 | /** | 271 | /** |
273 | * imr_debugfs_unregister - unregister debugfs hooks. | ||
274 | * | ||
275 | * @idev: pointer to imr_device structure. | ||
276 | * @return: | ||
277 | */ | ||
278 | static void imr_debugfs_unregister(struct imr_device *idev) | ||
279 | { | ||
280 | debugfs_remove(idev->file); | ||
281 | } | ||
282 | |||
283 | /** | ||
284 | * imr_check_params - check passed address range IMR alignment and non-zero size | 272 | * imr_check_params - check passed address range IMR alignment and non-zero size |
285 | * | 273 | * |
286 | * @base: base address of intended IMR. | 274 | * @base: base address of intended IMR. |
@@ -614,7 +602,6 @@ static const struct x86_cpu_id imr_ids[] __initconst = { | |||
614 | { X86_VENDOR_INTEL, 5, 9 }, /* Intel Quark SoC X1000. */ | 602 | { X86_VENDOR_INTEL, 5, 9 }, /* Intel Quark SoC X1000. */ |
615 | {} | 603 | {} |
616 | }; | 604 | }; |
617 | MODULE_DEVICE_TABLE(x86cpu, imr_ids); | ||
618 | 605 | ||
619 | /** | 606 | /** |
620 | * imr_init - entry point for IMR driver. | 607 | * imr_init - entry point for IMR driver. |
@@ -640,22 +627,4 @@ static int __init imr_init(void) | |||
640 | imr_fixup_memmap(idev); | 627 | imr_fixup_memmap(idev); |
641 | return 0; | 628 | return 0; |
642 | } | 629 | } |
643 | 630 | device_initcall(imr_init); | |
644 | /** | ||
645 | * imr_exit - exit point for IMR code. | ||
646 | * | ||
647 | * Deregisters debugfs, leave IMR state as-is. | ||
648 | * | ||
649 | * return: | ||
650 | */ | ||
651 | static void __exit imr_exit(void) | ||
652 | { | ||
653 | imr_debugfs_unregister(&imr_dev); | ||
654 | } | ||
655 | |||
656 | module_init(imr_init); | ||
657 | module_exit(imr_exit); | ||
658 | |||
659 | MODULE_AUTHOR("Bryan O'Donoghue <pure.logic@nexus-software.ie>"); | ||
660 | MODULE_DESCRIPTION("Intel Isolated Memory Region driver"); | ||
661 | MODULE_LICENSE("Dual BSD/GPL"); | ||