On Sun, 2016-02-14 at 18:09 -0500, Paul Gortmaker wrote: > The Kconfig currently controlling compilation of this code is: > > arch/x86/Kconfig.debug:config DEBUG_IMR_SELFTEST > arch/x86/Kconfig.debug: bool "Isolated Memory Region self test" > > ...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. > > Cc: Thomas Gleixner <[email protected]> > Cc: Ingo Molnar <[email protected]> > Cc: "H. Peter Anvin" <[email protected]> > Cc: Bryan O'Donoghue <[email protected]> > Cc: [email protected] > Signed-off-by: Paul Gortmaker <[email protected]> > --- > arch/x86/platform/intel-quark/imr_selftest.c | 15 ++------------- > 1 file changed, 2 insertions(+), 13 deletions(-) > > diff --git a/arch/x86/platform/intel-quark/imr_selftest.c > b/arch/x86/platform/intel-quark/imr_selftest.c > index 278e4da4222f..0381343a0d3a 100644 > --- a/arch/x86/platform/intel-quark/imr_selftest.c > +++ b/arch/x86/platform/intel-quark/imr_selftest.c > @@ -1,5 +1,5 @@ > /** > - * imr_selftest.c > + * imr_selftest.c -- Intel Isolated Memory Region self-test driver > * > * Copyright(c) 2013 Intel Corporation. > * Copyright(c) 2015 Bryan O'Donoghue <[email protected]> > @@ -15,7 +15,6 @@ > #include <asm/imr.h> > #include <linux/init.h> > #include <linux/mm.h> > -#include <linux/module.h> > #include <linux/types.h> > > #define SELFTEST KBUILD_MODNAME ": " > @@ -106,7 +105,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_self_test_init - entry point for IMR driver. > @@ -125,13 +123,4 @@ static int __init imr_self_test_init(void) > * > * return: > */ > -static void __exit imr_self_test_exit(void) > -{ > -} > - > -module_init(imr_self_test_init); > -module_exit(imr_self_test_exit); > - > -MODULE_AUTHOR("Bryan O'Donoghue <[email protected]>"); > -MODULE_DESCRIPTION("Intel Isolated Memory Region self-test driver"); > -MODULE_LICENSE("Dual BSD/GPL"); > +device_initcall(imr_self_test_init);
Fine by me. Reviewed-by: Bryan O'Donoghue <[email protected]>
