Skip to contentSkip to conversation

platform: olpc: make ec explicitly non-modular

PATCH Applied Paul Gortmaker 3 participants 3 messages Aug 15, 2016 – Aug 17, 2016 x86 platform drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 platform: olpc: make ec explicitly non-modular

The Kconfig entry controlling compilation of this code is:

arch/x86/Kconfig:config OLPC
arch/x86/Kconfig: bool "One Laptop Per Child support"

...meaning that it currently is not being built as a module by anyone.

Lets remove the couple traces of modular infrastructure use, so that when reading the driver there is no doubt it is builtin-only.

We delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments.

---
 drivers/platform/olpc/olpc-ec.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/platform/olpc/olpc-ec.c +3 -5
index f99b183d5296..374a8028fec7 100644
@@ -1,6 +1,8 @@
 /*
  * Generic driver for the OLPC Embedded Controller.
  *
+ * Author: Andres Salomon <[email protected]>
+ *
  * Copyright (C) 2011-2012 One Laptop per Child Foundation.
  *
  * Licensed under the GPL v2 or later.
@@ -12,7 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/list.h>
 #include <linux/olpc-ec.h>
 #include <asm/olpc.h>
@@ -326,8 +328,4 @@ static int __init olpc_ec_init_module(void)
 {
 	return platform_driver_register(&olpc_ec_plat_driver);
 }
-
 arch_initcall(olpc_ec_init_module);
-
-MODULE_AUTHOR("Andres Salomon <[email protected]>");
-MODULE_LICENSE("GPL");
Signature · 1 line
2.8.4
Acked-by on v1 1/1
#1 lore raw

Fine by me.

Quoted 52 lines · On Mon, 15 Aug 2016 18:25:17 -0400 Paul Gortmaker…

The Kconfig entry controlling compilation of this code is:

arch/x86/Kconfig:config OLPC
arch/x86/Kconfig: bool "One Laptop Per Child support"

...meaning that it currently is not being built as a module by anyone.

Lets remove the couple traces of modular infrastructure use, so that when reading the driver there is no doubt it is builtin-only.

We delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments.

---
 drivers/platform/olpc/olpc-ec.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
(quoted diff) +0 -0

b/drivers/platform/olpc/olpc-ec.c index f99b183d5296..374a8028fec7 100644 --- a/drivers/platform/olpc/olpc-ec.c
+++ b/drivers/platform/olpc/olpc-ec.c

drivers/platform/olpc/olpc-ec.c +3 -5
@@ -1,6 +1,8 @@
 /*
  * Generic driver for the OLPC Embedded Controller.
  *
+ * Author: Andres Salomon <[email protected]>
+ *
  * Copyright (C) 2011-2012 One Laptop per Child Foundation.
  *
  * Licensed under the GPL v2 or later.
@@ -12,7 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/list.h>
 #include <linux/olpc-ec.h>
 #include <asm/olpc.h>
@@ -326,8 +328,4 @@ static int __init olpc_ec_init_module(void)
 {
 	return platform_driver_register(&olpc_ec_plat_driver);
 }
-
 arch_initcall(olpc_ec_init_module);
-
-MODULE_AUTHOR("Andres Salomon <[email protected]>");
-MODULE_LICENSE("GPL");
Applied
#2 lore raw
Quoted 25 lines · Andres Salomon

Fine by me.

Quoted 17 lines · On Mon, 15 Aug 2016 18:25:17 -0400 Paul Gortmaker…

The Kconfig entry controlling compilation of this code is:

arch/x86/Kconfig:config OLPC
arch/x86/Kconfig: bool "One Laptop Per Child support"

...meaning that it currently is not being built as a module by anyone.

Lets remove the couple traces of modular infrastructure use, so that when reading the driver there is no doubt it is builtin-only.

We delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments.

Queued to fixes for 4.8. Thanks.

Signature · 2 lines
Darren Hart
Intel Open Source Technology Center