x86/platform: Make platform/intel-quark/imr.c explicitly non-modular (7f5301b7) · Commits · 戴 / test

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

+2 −33

Original line number	Diff line number	Diff line
		/**
		* 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 {
		@@ -269,17 +268,6 @@ static int imr_debugfs_register(struct imr_device *idev)
		return PTR_ERR_OR_ZERO(idev->file);
		}

		/**
		* 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
		*
		@@ -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);

Admin message