| Message ID | 20160704215058.13593-1-paul.gortmaker@windriver.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Mon, 4 Jul 2016 17:50:58 -0400 > The Kconfig controlling build of this code is currently: > > drivers/connector/Kconfig:config PROC_EVENTS > drivers/connector/Kconfig: bool "Report process events to userspace" > > ...meaning that it currently is not being built as a module by anyone. > Lets remove the two modular references, 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. > > Cc: Evgeniy Polyakov <zbr@ioremap.net> > Cc: netdev@vger.kernel.org > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Applied, thanks.
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c index b02f9c606e0b..a782ce87715c 100644 --- a/drivers/connector/cn_proc.c +++ b/drivers/connector/cn_proc.c @@ -22,7 +22,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <linux/module.h> #include <linux/kernel.h> #include <linux/ktime.h> #include <linux/init.h> @@ -390,5 +389,4 @@ static int __init cn_proc_init(void) } return 0; } - -module_init(cn_proc_init); +device_initcall(cn_proc_init);
The Kconfig controlling build of this code is currently: drivers/connector/Kconfig:config PROC_EVENTS drivers/connector/Kconfig: bool "Report process events to userspace" ...meaning that it currently is not being built as a module by anyone. Lets remove the two modular references, 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. Cc: Evgeniy Polyakov <zbr@ioremap.net> Cc: netdev@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- drivers/connector/cn_proc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)