Commit 389b2a1c authored Oct 29, 2016 by Paul Gortmaker Committed by Greg Kroah-Hartman Nov 10, 2016

lightnvm: make core.c explicitly non-modular



The Kconfig currently controlling compilation of this code is:

drivers/lightnvm/Kconfig:menuconfig NVM
drivers/lightnvm/Kconfig:       bool "Open-Channel SSD target 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_misc_driver translates to device_initcall in the non-modular
case, the init ordering remains unchanged with this commit.

We also delete the MODULE_LICENSE tag etc. since all that information
is already contained at the top of the file in the comments.

We replace module.h with moduleparam.h because this file still uses
module params to control behaviour.

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

Cc: Matias Bjorling <mb@lightnvm.io>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent c4d7e510

drivers/lightnvm/core.c

+6 −8

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@
		#include <linux/types.h>
		#include <linux/sem.h>
		#include <linux/bitmap.h>
		#include <linux/module.h>
		#include <linux/moduleparam.h>
		#include <linux/miscdevice.h>
		#include <linux/lightnvm.h>
		#include <linux/sched/sysctl.h>
		@@ -889,6 +889,10 @@ static const struct kernel_param_ops nvm_configure_by_str_event_param_ops = {
		.get = nvm_configure_get,
		};

		/*
		* Not available as modular, but easiest way to remain compatible with
		* existing boot arg behaviour is to continue using module param here.
		*/
		#undef MODULE_PARAM_PREFIX
		#define MODULE_PARAM_PREFIX "lnvm."

		@@ -1162,10 +1166,4 @@ static struct miscdevice _nvm_misc = {
		.nodename = "lightnvm/control",
		.fops = &_ctl_fops,
		};
		module_misc_device(_nvm_misc);

		MODULE_ALIAS_MISCDEV(MISC_DYNAMIC_MINOR);

		MODULE_AUTHOR("Matias Bjorling <m@bjorling.me>");
		MODULE_LICENSE("GPL v2");
		MODULE_VERSION("0.1");
		builtin_misc_device(_nvm_misc);

Admin message